tree 4e3333cde6da6c49dcd81920410bf5a33055f03a
parent b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea
parent 8bcb97659656042f3132b2814b19709856aa1335
author Arnd Bergmann <arnd@arndb.de> 1320198415 +0100
committer Arnd Bergmann <arnd@arndb.de> 1320198415 +0100

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