Arnd Bergmann abc3f126ac 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		2011-11-02 02:46:55 +01:00
..
mach	Merge branch 'imx/imx6q' into next/soc	2011-11-02 02:46:55 +01:00