Merge tag 'for-v4.1' of git://git.infradead.org/battery-2.6

Pull power supply and reset changes from Sebastian Reichel:

 - new API for safe access of power supply function attrs

 - devres support for power supply (un)registration

 - new drivers / chips:
     - generic syscon based poweroff driver
     - iio & charger driver for da9150
     - fuel gauge driver for axp288
     - bq27x00: add support for bq27510
     - bq2415x: add support for bq24157s

 - twl4030-madc-battery: convert to iio consumer

 - misc fixes

* tag 'for-v4.1' of git://git.infradead.org/battery-2.6: (66 commits)
  power: twl4030_madc_battery: Add missing MODULE_ALIAS
  power: twl4030-madc-battery: Convert to iio consumer.
  dt: power: Add docs for generic SYSCON poweroff driver.
  power: reset: Add generic SYSCON register mapped poweroff.
  power: max17042_battery: add missed blank
  power: max17042_battery: Use reg type instead of chip type
  power/reset: at91: big endian fixes for atsama5d3x
  power_supply: charger-manager: Fix dereferencing of ERR_PTR
  HID: input: Fix NULL pointer dereference when power_supply_register fails
  power: constify of_device_id array
  power/reset/rmobile-reset.c: Fix !HAS_IOMEM build
  power_supply: 88pm860x_charger: Fix possible NULL pointer dereference and use of initialized variable
  arm: mach-pxa: Decrement the power supply's device reference counter
  mfd: ab8500: Decrement the power supply's device reference counter
  power_supply: bq2415x_charger: Decrement the power supply's device reference counter
  power_supply: 88pm860x_charger: Decrement the power supply's device reference counter
  x86/olpc/xo15/sci: Use newly added power_supply_put API
  x86/olpc/xo1/sci: Use newly added power_supply_put API
  power_supply: charger-manager: Decrement the power supply's device reference counter
  power_supply: Increment power supply use counter when obtaining references
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/hid/hid-sony.c
Simple merge

diff --cc drivers/iio/adc/Kconfig
index 46379b1fb25b59b10018a121b2cc8dc78082d4a6,fc6f90614218fa8ba193a8d95249401a862862d6..d82af14986ba44c1fde7498bb378fa9f4fe9513f
--- 1/drivers/iio/adc/Kconfig
--- 2/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@@ -135,10 -135,18 +135,19 @@@ config AXP288_AD
          device. Depending on platform configuration, this general purpose ADC can
          be used for sampling sensors such as thermal resistors.
  
+ config DA9150_GPADC
+       tristate "Dialog DA9150 GPADC driver support"
+       depends on MFD_DA9150
+       help
+         Say yes here to build support for Dialog DA9150 GPADC.
+ 
+         This driver can also be built as a module. If chosen, the module name
+         will be da9150-gpadc.
+ 
  config CC10001_ADC
        tristate "Cosmic Circuits 10001 ADC driver"
 -      depends on HAS_IOMEM || HAVE_CLK || REGULATOR
 +      depends on HAVE_CLK || REGULATOR
 +      depends on HAS_IOMEM
        select IIO_BUFFER
        select IIO_TRIGGERED_BUFFER
        help