diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 15:17:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 15:17:26 +1100 |
| commit | 8921faeec204b791f6ca74449a77c1d3dc20aacf (patch) | |
| tree | cfbc26a2eacc71ec6524c0ded6d7b75a6fca631c /MAINTAINERS | |
| parent | 3df4f976eadc715142d1e07026becd9d346ed1ff (diff) | |
| parent | 90edb95fd0507a9b7592f4a42a8688f0f3901ff2 (diff) | |
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-spear13xx/spear1340.c
arch/arm/mach-spear3xx/spear3xx.c
arch/arm/mach-spear6xx/spear6xx.c
arch/arm/mach-zynq/common.c
drivers/crypto/omap-sham.c
drivers/mfd/db8500-prcmu.c
drivers/pinctrl/pinctrl-nomadik.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 45a060cb9b2e..9f180731e274 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1290,6 +1290,14 @@ S: Maintained F: arch/arm/mach-pxa/z2.c F: arch/arm/mach-pxa/include/mach/z2.h +ARM/ZYNQ ARCHITECTURE +M: Michal Simek <michal.simek@xilinx.com> +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +W: http://wiki.xilinx.com +T: git git://git.xilinx.com/linux-xlnx.git +S: Supported +F: arch/arm/mach-zynq/ + ARM64 PORT (AARCH64 ARCHITECTURE) M: Catalin Marinas <catalin.marinas@arm.com> M: Will Deacon <will.deacon@arm.com> @@ -4288,6 +4296,7 @@ M: Thomas Gleixner <tglx@linutronix.de> S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core F: kernel/irq/ +F: drivers/irqchip/ IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY) M: Benjamin Herrenschmidt <benh@kernel.crashing.org> |