summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 11:25:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 11:25:16 -0700
commita724eada8c2a7b62463b73ccf73fd0bb6e928aeb (patch)
tree9fbf124022944cba2fdd6aa468f1bad8adc6b2ab /MAINTAINERS
parent1b9894f342a39601bb0420b7b8c7e445670c1b51 (diff)
parentdfdd8cc903288bb2e2ad6731545be3db7304c133 (diff)
downloadlinux-stable-a724eada8c2a7b62463b73ccf73fd0bb6e928aeb.tar.gz
linux-stable-a724eada8c2a7b62463b73ccf73fd0bb6e928aeb.tar.bz2
linux-stable-a724eada8c2a7b62463b73ccf73fd0bb6e928aeb.zip
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
* 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6: Add MAINTAINERS entry for ARM/INTEL IXP4xx arch support. ixp4xx: arch_idle() documentation fixup ixp4xx: timer and clocks cleanups
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 8f6297881077..7c1c0b05b298 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -686,6 +686,13 @@ M: Lennert Buytenhek <kernel@wantstofly.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
+ARM/INTEL IXP4XX ARM ARCHITECTURE
+M: Imre Kaloz <kaloz@openwrt.org>
+M: Krzysztof Halasa <khc@pm.waw.pl>
+L: linux-arm-kernel@lists.infradead.org
+S: Maintained
+F: arch/arm/mach-ixp4xx/
+
ARM/INTEL XSC3 (MANZANO) ARM CORE
M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <dan.j.williams@intel.com>