Files
linux-st/include/linux
Linus Torvalds 16bb85bc12 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}
2010-08-12 09:58:33 -07:00
..
2010-08-12 08:43:30 -07:00
2010-08-12 08:43:30 -07:00
2010-08-12 08:43:30 -07:00
2010-08-06 15:36:47 -05:00
2010-08-12 08:43:30 -07:00
2010-08-10 15:33:09 -07:00
2010-08-09 20:45:05 -07:00
2010-08-10 11:49:21 -07:00
2010-08-11 08:59:23 -07:00
2010-08-09 20:44:58 -07:00
2010-08-09 16:48:45 -04:00
2010-08-09 20:45:00 -07:00
2010-08-11 00:29:47 -04:00
2010-08-09 16:47:27 -04:00
2010-08-09 20:45:02 -07:00
2010-08-10 13:47:46 -07:00
2010-08-09 16:48:44 -04:00
2010-08-12 11:47:26 +10:00
2010-08-11 08:59:02 -07:00