diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-01-10 08:09:29 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-01-10 08:09:29 +1100 |
| commit | 5b0730c6070f8a738ad2ea223f73d70f414ac287 (patch) | |
| tree | 83e9842dc057859df365347641dc4dd1eda30e2d /MAINTAINERS | |
| parent | ea7b1b654282774607e1c65ad7a76d16e4baae64 (diff) | |
| parent | 01b94ede7fc87ebde722d818303c09e63468b6b9 (diff) | |
Merge remote-tracking branch 'arm-soc/for-next'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bafc8c51b402..e0ba29ef5997 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2060,6 +2060,7 @@ F: drivers/rtc/rtc-pl031.c F: drivers/watchdog/coh901327_wdt.c F: Documentation/devicetree/bindings/arm/ste-* F: Documentation/devicetree/bindings/arm/ux500/ +F: Documentation/devicetree/bindings/arm/ux500.yaml T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git ARM/NUVOTON NPCM ARCHITECTURE @@ -15972,6 +15973,7 @@ F: drivers/firmware/arm_scpi.c F: drivers/firmware/arm_scmi/ F: drivers/reset/reset-scmi.c F: include/linux/sc[mp]i_protocol.h +F: include/trace/events/scmi.h SYSTEM RESET/SHUTDOWN DRIVERS M: Sebastian Reichel <sre@kernel.org> |