diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-02-08 09:47:05 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-02-08 09:47:06 +0100 |
| commit | 78b390bd5657e79f8e60b736f81ac1a3203777ea (patch) | |
| tree | 21030dfcf25cef41b5c39720c7cd1377c8c2647a /MAINTAINERS | |
| parent | 7eabedfb2903493d2601fd224f1e027cd1860fa0 (diff) | |
| parent | 6dc701ee9fabfc929cae2d7acc957bf38e4c3264 (diff) | |
Merge tag 'asahi-soc-maintainers-5.17' of https://github.com/AsahiLinux/linux into arm/fixes
Apple SoC MAINTAINERS updates for 5.17.
Adds the watchdog driver MAINTAINERS changes. The driver itself is
already merged.
This branch is based on asahi-soc-dt-5.17-v2 to avoid a merge conflict.
* tag 'asahi-soc-maintainers-5.17' of https://github.com/AsahiLinux/linux:
MAINTAINERS: Add Apple watchdog to ARM/APPLE MACHINE SUPPORT
Link: https://lore.kernel.org/r/24ae6871-3e67-5c7f-2060-28048db439a2@marcan.st
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index caa5b018bd36..7158c29c6cbd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1780,6 +1780,7 @@ F: drivers/irqchip/irq-apple-aic.c F: drivers/mailbox/apple-mailbox.c F: drivers/pinctrl/pinctrl-apple-gpio.c F: drivers/soc/apple/* +F: drivers/watchdog/apple_wdt.c F: include/dt-bindings/interrupt-controller/apple-aic.h F: include/dt-bindings/pinctrl/apple.h F: include/linux/apple-mailbox.h |