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 /drivers/power/olpc_battery.c | |
| parent | 4936a3b90d79dd8775c6ac23c2cf2dcebe29abde (diff) | |
| parent | f59f5bcb605f40d418aceb6f6047069435ffac72 (diff) | |
| download | lwn-16bb85bc12e7d0b066b1471185f3889cb1ceb382.tar.gz lwn-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 'drivers/power/olpc_battery.c')
| -rw-r--r-- | drivers/power/olpc_battery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c index 5ab9109b69e6..aafc1c506eda 100644 --- a/drivers/power/olpc_battery.c +++ b/drivers/power/olpc_battery.c @@ -1,7 +1,7 @@ /* * Battery driver for One Laptop Per Child board. * - * Copyright © 2006 David Woodhouse <dwmw2@infradead.org> + * Copyright © 2006-2010 David Woodhouse <dwmw2@infradead.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as |