Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8f6297881077993c9618b4ee106d527ba19beeab..7c1c0b05b298f069756c1dc119083e75f0e74a24 100644 (file)
--- 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>