Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  gpio-charger: Fix checking return value of request_any_context_irq
  power_supply: MAX17042: Support additional properties
  max8903_charger: Allow platform data to be __initdata
  power_supply: Add charger driver for MAX8998/LP3974
  power_supply: Add charger driver for MAX8997/8966
  max17042_battery: Remove obsolete cleanup for clientdata
  twl4030_charger: Fix warnings
  wm831x_power: Support multiple instances
  wm831x_backup: Support multiple instances
  apm_power: Fix style error in macros
  s3c_adc_battery: Fix annotation for s3c_adc_battery_probe()
  bq20z75: Enable detection after registering
  bq20z75: Add support for external notification

diff --combined drivers/power/Kconfig
index e57b50b,fddc392..57de051
--- 1/drivers/power/Kconfig
--- 2/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@@ -68,13 -68,6 +68,13 @@@ config BATTERY_DS276
        help
          Say Y here to enable support for batteries with ds2760 chip.
  
 +config BATTERY_DS2780
 +      tristate "DS2780 battery driver"
 +      select W1
 +      select W1_SLAVE_DS2780
 +      help
 +        Say Y here to enable support for batteries with ds2780 chip.
 +
  config BATTERY_DS2782
        tristate "DS2782/DS2786 standalone gas-gauge"
        depends on I2C
@@@ -235,4 -228,18 +235,18 @@@ config CHARGER_GPI
          This driver can be build as a module. If so, the module will be
          called gpio-charger.
  
+ config CHARGER_MAX8997
+       tristate "Maxim MAX8997/MAX8966 PMIC battery charger driver"
+       depends on MFD_MAX8997 && REGULATOR_MAX8997
+       help
+         Say Y to enable support for the battery charger control sysfs and
+         platform data of MAX8997/LP3974 PMICs.
+ 
+ config CHARGER_MAX8998
+       tristate "Maxim MAX8998/LP3974 PMIC battery charger driver"
+       depends on MFD_MAX8998 && REGULATOR_MAX8998
+       help
+         Say Y to enable support for the battery charger control sysfs and
+         platform data of MAX8998/LP3974 PMICs.
+ 
  endif # POWER_SUPPLY

diff --combined drivers/power/Makefile
index 009a90f,a18e899..b4af13d
--- 1/drivers/power/Makefile
--- 2/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@@ -15,7 -15,6 +15,7 @@@ obj-$(CONFIG_WM8350_POWER)    += wm8350_po
  obj-$(CONFIG_TEST_POWER)      += test_power.o
  
  obj-$(CONFIG_BATTERY_DS2760)  += ds2760_battery.o
 +obj-$(CONFIG_BATTERY_DS2780)  += ds2780_battery.o
  obj-$(CONFIG_BATTERY_DS2782)  += ds2782_battery.o
  obj-$(CONFIG_BATTERY_PMU)     += pmu_battery.o
  obj-$(CONFIG_BATTERY_OLPC)    += olpc_battery.o
@@@ -36,3 -35,5 +36,5 @@@ obj-$(CONFIG_CHARGER_ISP1704) += isp170
  obj-$(CONFIG_CHARGER_MAX8903) += max8903_charger.o
  obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o
  obj-$(CONFIG_CHARGER_GPIO)    += gpio-charger.o
+ obj-$(CONFIG_CHARGER_MAX8997) += max8997_charger.o
+ obj-$(CONFIG_CHARGER_MAX8998) += max8998_charger.o