Learn more about cloning repositories
You have read-only access
Merge branch 'imx/devel' into imx/imx6q Conflicts: arch/arm/plat-mxc/include/mach/memory.h
