Merge tag 'for-v3.19' of git://git.infradead.org/battery-2.6

Pull power supply updates from Sebastian Reichel::
 "Power supply and reset changes for the v3.19 series

   - update power/reset drivers to use kernel restart handler
   - add power off driver for i.mx6
   - add DT support for gpio-charger"

* tag 'for-v3.19' of git://git.infradead.org/battery-2.6:
  power: reset: adjust priority of simple syscon reboot driver
  power: ds2782_battery: Simplify the PM hooks
  power/reset: brcmstb: Register with kernel restart handler
  power/reset: hisi: Register with kernel restart handler
  power/reset: keystone: Register with kernel restart handler
  power/reset: axxia: Register with kernel restart handler
  power/reset: xgene: Register with kernel restart handler
  power/reset: xgene: Use mdelay instead of jiffies based timeout
  power/reset: xgene: Use local variable dev instead of pdev->dev
  power/reset: xgene: Drop devm_kfree
  power/reset: xgene: Return -ENOMEM if out of memory
  power/reset: vexpress: Register with kernel restart handler
  power: reset: imx-snvs-poweroff: add power off driver for i.mx6
  power: gpio-charger: add device tree support
  dt-bindings: document gpio-charger bindings

diff --cc drivers/power/gpio-charger.c
index 3ee889f,df984ec..aef74bd
--- 1/drivers/power/gpio-charger.c
--- 2/drivers/power/gpio-charger.c
+++ b/drivers/power/gpio-charger.c
@@@ -194,7 -261,9 +261,8 @@@ static struct platform_driver gpio_char
        .remove = gpio_charger_remove,
        .driver = {
                .name = "gpio-charger",
 -              .owner = THIS_MODULE,
                .pm = &gpio_charger_pm_ops,
+               .of_match_table = gpio_charger_match,
        },
  };
  

diff --cc drivers/power/reset/brcmstb-reboot.c
Simple merge

diff --cc drivers/power/reset/keystone-reset.c
Simple merge