diff options
author | Philipp Zabel <p.zabel@pengutronix.de> | 2017-10-18 15:55:44 +0200 |
---|---|---|
committer | Philipp Zabel <p.zabel@pengutronix.de> | 2017-10-18 15:59:30 +0200 |
commit | 542befbb18056c4fda7b458aa6146a52b2fd389c (patch) | |
tree | 5963eb9f0e4acda6ef6ac5cb3e82d83fafdd389f /MAINTAINERS | |
parent | reset: zx2967: use the reset-simple driver (diff) | |
parent | ARC: reset: introduce AXS10x reset driver (diff) | |
download | linux-542befbb18056c4fda7b458aa6146a52b2fd389c.tar.xz 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-- | MAINTAINERS | 6 |
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> |