Merge tag 'for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2016 21:06:21 +0000 (14:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2016 21:06:21 +0000 (14:06 -0700)
commit7992893c5a9fdffa42117f6f749359466e06bdf6
treef8b164faacaa001c5d9bfa5d752fd7d8f3dd2260
parent6eb59af580dcffc6f6982ac8ef6d27a1a5f26b27
parent4a99fa06a8ca27a5187636e630568658000af575
Merge tag 'for-v4.7' of git://git./linux/kernel/git/sre/linux-power-supply

Pull power supply and reset updates from Sebastian Reichel:

 - alternative reset driver for new at91 SoCs

 - misc fixes

* tag 'for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  sbs-battery: fix power status when battery charging near dry
  power: ipaq-micro-battery: freeing the wrong variable
  power/max8925: freeing wrong variable
  power: reset: at91-shdwc: add new shutdown controller driver
  ARM: dts: at91: shdwc binding: add new shutdown controller documentation
Documentation/devicetree/bindings/arm/atmel-at91.txt
MAINTAINERS