| commit | 16bb85bc12e7d0b066b1471185f3889cb1ceb382 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 12 09:58:33 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 12 09:58:33 2010 -0700 |
| tree | 88f7bb3ff052ea0e68d5416853d8fd68a508d8e7 | |
| parent | 4936a3b90d79dd8775c6ac23c2cf2dcebe29abde [diff] | |
| parent | f59f5bcb605f40d418aceb6f6047069435ffac72 [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}