Merge branch 'imx/devel' into next/dt
The board changes in the imx/devel branch conflict with other changes in
the device imx/dt branch.
Conflicts:
arch/arm/mach-mx5/board-mx53_loco.c
arch/arm/mach-mx5/board-mx53_smd.c
arch/arm/plat-mxc/include/mach/common.h
arch/arm/plat-mxc/include/mach/memory.h
Signed-off-by: NArnd Bergmann <arnd@arndb.de>
Showing
arch/arm/mach-imx/cpu-imx25.c
0 → 100644
arch/arm/mach-imx/mm-imx31.c
已删除
100644 → 0
arch/arm/mach-mx5/devices.c
已删除
100644 → 0
arch/arm/mach-mx5/devices.h
已删除
100644 → 0
arch/arm/mach-mx5/mm-mx50.c
已删除
100644 → 0
arch/arm/mach-mxs/mach-m28evk.c
0 → 100644
arch/arm/mach-mxs/mm-mx28.c
已删除
100644 → 0
此差异已折叠。
此差异已折叠。
想要评论请 注册 或 登录