https://github.com/torvalds/linux
Revision 16bb85bc12e7d0b066b1471185f3889cb1ceb382 authored by Linus Torvalds on 12 August 2010, 16:58:33 UTC, committed by Linus Torvalds on 12 August 2010, 16:58:33 UTC
* 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}
2 parent s 4936a3b + f59f5bc
History
Tip revision: 16bb85bc12e7d0b066b1471185f3889cb1ceb382 authored by Linus Torvalds on 12 August 2010, 16:58:33 UTC
Merge git://git.infradead.org/battery-2.6
Tip revision: 16bb85b

back to top