summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_sigmatel.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 09:58:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 09:58:33 -0700
commit16bb85bc12e7d0b066b1471185f3889cb1ceb382 (patch)
tree88f7bb3ff052ea0e68d5416853d8fd68a508d8e7 /sound/pci/hda/patch_sigmatel.c
parent4936a3b90d79dd8775c6ac23c2cf2dcebe29abde (diff)
parentf59f5bcb605f40d418aceb6f6047069435ffac72 (diff)
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: intel_mid_battery: Fix battery scaling intel_mid_battery: Fix the argument order to intel_scu_ipc_command olpc_battery: Fix build failure caused by sysfs changes Add s3c-adc-battery driver Intel MID platform battery driver Fix up trivial conflicts (battery drivers added from different branches) in drivers/power/{Kconfig,Makefile}
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
0 files changed, 0 insertions, 0 deletions