diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 09:58:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 09:58:33 -0700 |
| commit | 16bb85bc12e7d0b066b1471185f3889cb1ceb382 (patch) | |
| tree | 88f7bb3ff052ea0e68d5416853d8fd68a508d8e7 /Documentation | |
| parent | x86/hpet: Use the FSEC_PER_SEC constant for femto-second periods (diff) | |
| parent | intel_mid_battery: Fix battery scaling (diff) | |
| download | linux-dev-16bb85bc12e7d0b066b1471185f3889cb1ceb382.tar.xz linux-dev-16bb85bc12e7d0b066b1471185f3889cb1ceb382.zip | |
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 'Documentation')
0 files changed, 0 insertions, 0 deletions