Skip to content

Commit 78b390b

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 7eabedf + 6dc701e commit 78b390b

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1780,6 +1780,7 @@ F: drivers/irqchip/irq-apple-aic.c
17801780
F: drivers/mailbox/apple-mailbox.c
17811781
F: drivers/pinctrl/pinctrl-apple-gpio.c
17821782
F: drivers/soc/apple/*
1783+
F: drivers/watchdog/apple_wdt.c
17831784
F: include/dt-bindings/interrupt-controller/apple-aic.h
17841785
F: include/dt-bindings/pinctrl/apple.h
17851786
F: include/linux/apple-mailbox.h

0 commit comments

Comments
 (0)