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

diff --cc arch/arm/mach-s3c2442/mach-gta02.c
Simple merge

diff --cc drivers/mfd/wm831x-core.c
Simple merge

diff --cc drivers/power/Kconfig
Simple merge

diff --cc drivers/power/Makefile
Simple merge

diff --cc drivers/power/pcf50633-charger.c
Simple merge

diff --cc include/linux/mfd/pcf50633/core.h
Simple merge