Learn more about cloning repositories
You have read-only access
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
