diff options
author | Mark Brown <broonie@kernel.org> | 2019-07-04 17:34:32 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-07-04 17:34:32 +0100 |
commit | 65244e5b1f4fade54b490b47b871cefe1d7d07f0 (patch) | |
tree | 7474acf605cd0ddb2cb3ca62cc4b41494a049105 /MAINTAINERS | |
parent | f0386617dca6deaca241a01efb9a579d0d727e7f (diff) | |
parent | 3c7577d442a76c2015dd765497395fb394b78051 (diff) |
Merge branch 'regulator-5.3' into regulator-next
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 01a52fc964da..53dbf6c20cd5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4707,6 +4707,7 @@ F: Documentation/devicetree/bindings/mfd/da90*.txt F: Documentation/devicetree/bindings/input/da90??-onkey.txt F: Documentation/devicetree/bindings/thermal/da90??-thermal.txt F: Documentation/devicetree/bindings/regulator/da92*.txt +F: Documentation/devicetree/bindings/regulator/slg51000.txt F: Documentation/devicetree/bindings/watchdog/da90??-wdt.txt F: Documentation/devicetree/bindings/sound/da[79]*.txt F: drivers/gpio/gpio-da90??.c @@ -4722,6 +4723,7 @@ F: drivers/power/supply/da9052-battery.c F: drivers/power/supply/da91??-*.c F: drivers/regulator/da903x.c F: drivers/regulator/da9???-regulator.[ch] +F: drivers/regulator/slg51000-regulator.[ch] F: drivers/thermal/da90??-thermal.c F: drivers/rtc/rtc-da90??.c F: drivers/video/backlight/da90??_bl.c |