diff options
| author | Shawn Guo <shawn.guo@freescale.com> | 2014-07-02 09:37:10 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-05 06:51:59 +0200 |
| commit | ce515a6b8de2f52156e4abe722e55e4f371319d6 (patch) | |
| tree | 15cec00ff3e44c0943120675878d5e01dafa1a73 /MAINTAINERS | |
| parent | Merge tag 'mvebu-fixes-3.16-2' of git://git.infradead.org/linux-mvebu into fixes (diff) | |
| download | linux-ce515a6b8de2f52156e4abe722e55e4f371319d6.tar.xz linux-ce515a6b8de2f52156e4abe722e55e4f371319d6.zip | |
MAINTAINERS: merge MXS entry into IMX one
The mach-mxs platform is actually co-maintained by myself and
pengutronix folks. Also it's hosted in the same kernel tree as IMX.
So let's merge the entry into IMX one.
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 134483f206e4..161762e40b85 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -943,16 +943,10 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git F: arch/arm/mach-imx/ +F: arch/arm/mach-mxs/ F: arch/arm/boot/dts/imx* F: arch/arm/configs/imx*_defconfig -ARM/FREESCALE MXS ARM ARCHITECTURE -M: Shawn Guo <shawn.guo@linaro.org> -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -T: git git://git.linaro.org/people/shawnguo/linux-2.6.git -F: arch/arm/mach-mxs/ - ARM/GLOMATION GESBC9312SX MACHINE SUPPORT M: Lennert Buytenhek <kernel@wantstofly.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |