summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-11-16 16:21:27 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-11-16 16:21:27 +0100
commit89a4150331bc07014256714678ce8e9b238fc145 (patch)
tree3a0358208775f29f9e319b506ce849c5dbdc1a06 /MAINTAINERS
parent77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff)
parent68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff)
downloadop-kernel-dev-89a4150331bc07014256714678ce8e9b238fc145.zip
op-kernel-dev-89a4150331bc07014256714678ce8e9b238fc145.tar.gz
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 59203e7..99199e6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -797,7 +797,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
T: git git://git.pengutronix.de/git/imx/linux-2.6.git
F: arch/arm/mach-imx/
-F: arch/arm/plat-mxc/
F: arch/arm/configs/imx*_defconfig
ARM/FREESCALE IMX6
OpenPOWER on IntegriCloud