diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-20 14:06:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-20 14:06:21 -0700 |
| commit | 7992893c5a9fdffa42117f6f749359466e06bdf6 (patch) | |
| tree | f8b164faacaa001c5d9bfa5d752fd7d8f3dd2260 /MAINTAINERS | |
| parent | 6eb59af580dcffc6f6982ac8ef6d27a1a5f26b27 (diff) | |
| parent | 4a99fa06a8ca27a5187636e630568658000af575 (diff) | |
Merge tag 'for-v4.7' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 374ffa2d81b7..bb176dbfe81f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2048,6 +2048,11 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com> S: Supported F: drivers/tty/serial/atmel_serial.c +ATMEL AT91 SAMA5D2-Compatible Shutdown Controller +M: Nicolas Ferre <nicolas.ferre@atmel.com> +S: Supported +F: drivers/power/reset/at91-sama5d2_shdwc.c + ATMEL SAMA5D2 ADC DRIVER M: Ludovic Desroches <ludovic.desroches@atmel.com> L: linux-iio@vger.kernel.org |