Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Dec 2009 16:59:33 +0000 (08:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Dec 2009 16:59:33 +0000 (08:59 -0800)
commit48e902f0a3aea4b6b3a73e9d277b92024a493e6d
tree6dbb3a4c5ab4e7fc72172d8c11e7c0418b6559d1
parent7f6cd5408a8ace522ca7f15893243e94ccc913e0
parent9d233e8bb92e355fd20b14745c1d9ff402e0e685
Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  power_supply_sysfs: Handle -ENODATA in a special way
  wm831x_backup: Remove unused variables
  gta02: Set pcf50633 charger_reference_current_ma
  pcf50633: Query charger status directly
  pcf50633: Properly reenable charging when the supply conditions change
  pcf50633: Get rid of charging restart software auto-triggering
  pcf50633: introduces battery charging current control
  pcf50633: Add ac power supply class to the charger
  wm831x: Factor out WM831x backup battery charger
arch/arm/mach-s3c2442/mach-gta02.c
drivers/mfd/wm831x-core.c
drivers/power/Kconfig
drivers/power/Makefile
drivers/power/pcf50633-charger.c
include/linux/mfd/pcf50633/core.h