diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-14 15:23:00 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-14 15:25:32 -0800 |
| commit | 3e0a79695cf8600322c519b33df76b8bc2f1aaca (patch) | |
| tree | 322c96e36f819368150ccfc154f97f353abf6948 /MAINTAINERS | |
| parent | eb90217750136e4712f1d87a33e1951b80a1a365 (diff) | |
| parent | 75cac6abe756fde529a000e725dceed2b908f61a (diff) | |
| download | blackbird-op-linux-3e0a79695cf8600322c519b33df76b8bc2f1aaca.tar.gz blackbird-op-linux-3e0a79695cf8600322c519b33df76b8bc2f1aaca.zip | |
Merge tag 'sunxi-core-for-3.14-2' of https://github.com/mripard/linux into next/soc
From Maxime Ripard:
Second round of core additions for the Allwinner SoCs
Fixes to select missing configuration options, and update of the maintainer
file.
* tag 'sunxi-core-for-3.14-2' of https://github.com/mripard/linux:
ARM: sunxi: select ARM_PSCI
MAINTAINERS: Update Allwinner sunXi maintainer files
ARM: sunxi: Select RESET_CONTROLLER
ARM: sun6i: Add SMP support for the Allwinner A31
dt-bindings: fix example of allwinner interrupt controller
ARM: sunxi: Register the A31 reset IP in init_time
ARM: sunxi: Select ARCH_HAS_RESET_CONTROLLER
reset: Add Allwinner SoCs Reset Controller Driver
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6ea1fb247a8c..b6d1afbf9920 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -766,7 +766,12 @@ ARM/Allwinner A1X SoC support M: Maxime Ripard <maxime.ripard@free-electrons.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -F: arch/arm/mach-sunxi/ +N: sun[x4567]i + +ARM/Allwinner SoC Clock Support +M: Emilio López <emilio@elopez.com.ar> +S: Maintained +F: drivers/clk/sunxi/ ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES M: Andrew Victor <linux@maxim.org.za> |
