Skip to content
Commit abc3f126 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents b8df0ea2 8bcb9765
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment