diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:55 +0100 |
| commit | abc3f126ac736280c68db6472eb0040ddf6e1b1f (patch) | |
| tree | 4e3333cde6da6c49dcd81920410bf5a33055f03a /MAINTAINERS | |
| parent | b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea (diff) | |
| parent | 8bcb97659656042f3132b2814b19709856aa1335 (diff) | |
| download | linux-3.10-abc3f126ac736280c68db6472eb0040ddf6e1b1f.tar.gz linux-3.10-abc3f126ac736280c68db6472eb0040ddf6e1b1f.tar.bz2 linux-3.10-abc3f126ac736280c68db6472eb0040ddf6e1b1f.zip | |
Merge branch 'imx/imx6q' into next/soc
Conflicts:
Documentation/devicetree/bindings/arm/fsl.txt
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/plat-mxc/include/mach/common.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5066335b97d..1ba8fffdd7e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -793,6 +793,13 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-mx5/ +ARM/FREESCALE IMX6 +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-imx/*imx6* + ARM/GLOMATION GESBC9312SX MACHINE SUPPORT M: Lennert Buytenhek <kernel@wantstofly.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |