Merge branch 'imx/imx6q' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Wed, 2 Nov 2011 01:46:55 +0000 (02:46 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 2 Nov 2011 01:46:55 +0000 (02:46 +0100)
commitabc3f126ac736280c68db6472eb0040ddf6e1b1f
tree4e3333cde6da6c49dcd81920410bf5a33055f03a
parentb8df0ea26ac17c9a073f235c7fdfbdd1851b59ea
parent8bcb97659656042f3132b2814b19709856aa1335
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
Documentation/devicetree/bindings/arm/fsl.txt
MAINTAINERS
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/Makefile
arch/arm/mm/Kconfig
arch/arm/plat-mxc/include/mach/common.h