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

Merge branch 'imx/devel' into imx/imx6q 

Conflicts:
	arch/arm/plat-mxc/include/mach/memory.h
parents 94314a40 b4cbb8a4
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