summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2017-10-18 15:55:44 +0200
committerPhilipp Zabel <p.zabel@pengutronix.de>2017-10-18 15:59:30 +0200
commit542befbb18056c4fda7b458aa6146a52b2fd389c (patch)
tree5963eb9f0e4acda6ef6ac5cb3e82d83fafdd389f /MAINTAINERS
parentf0e0ada67dfd8342fd411da6e3bff10ff9bcc97b (diff)
parent376349232a93645624426db782cafe688054e6d6 (diff)
downloadlinux-542befbb18056c4fda7b458aa6146a52b2fd389c.tar.gz
linux-542befbb18056c4fda7b458aa6146a52b2fd389c.tar.bz2
linux-542befbb18056c4fda7b458aa6146a52b2fd389c.zip
Merge branch 'reset/arc' into reset/next
Merge the AXS10x driver, which is also merged into git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git for-next
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d48d8a238fae..f4fecfd2739c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12882,6 +12882,12 @@ F: arch/arc/plat-axs10x
F: arch/arc/boot/dts/ax*
F: Documentation/devicetree/bindings/arc/axs10*
+SYNOPSYS AXS10x RESET CONTROLLER DRIVER
+M: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
+S: Supported
+F: drivers/reset/reset-axs10x.c
+F: Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
+
SYNOPSYS DESIGNWARE DMAC DRIVER
M: Viresh Kumar <vireshk@kernel.org>
M: Andy Shevchenko <andriy.shevchenko@linux.intel.com>