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:
Arnd Bergmann <arnd@arndb.de>
Showing
- arch/arm/Kconfig 1 addition, 0 deletionsarch/arm/Kconfig
- arch/arm/Makefile 1 addition, 3 deletionsarch/arm/Makefile
- arch/arm/configs/imx_v4_v5_defconfig 54 additions, 14 deletionsarch/arm/configs/imx_v4_v5_defconfig
- arch/arm/configs/mx1_defconfig 0 additions, 91 deletionsarch/arm/configs/mx1_defconfig
- arch/arm/configs/mx21_defconfig 0 additions, 97 deletionsarch/arm/configs/mx21_defconfig
- arch/arm/configs/mx5_defconfig 37 additions, 23 deletionsarch/arm/configs/mx5_defconfig
- arch/arm/configs/mxs_defconfig 1 addition, 0 deletionsarch/arm/configs/mxs_defconfig
- arch/arm/mach-imx/Kconfig 19 additions, 33 deletionsarch/arm/mach-imx/Kconfig
- arch/arm/mach-imx/Makefile 7 additions, 8 deletionsarch/arm/mach-imx/Makefile
- arch/arm/mach-imx/cache-l2x0.c 0 additions, 56 deletionsarch/arm/mach-imx/cache-l2x0.c
- arch/arm/mach-imx/clock-imx25.c 6 additions, 0 deletionsarch/arm/mach-imx/clock-imx25.c
- arch/arm/mach-imx/clock-imx27.c 4 additions, 2 deletionsarch/arm/mach-imx/clock-imx27.c
- arch/arm/mach-imx/clock-imx31.c 4 additions, 4 deletionsarch/arm/mach-imx/clock-imx31.c
- arch/arm/mach-imx/clock-imx35.c 4 additions, 3 deletionsarch/arm/mach-imx/clock-imx35.c
- arch/arm/mach-imx/cpu-imx25.c 41 additions, 0 deletionsarch/arm/mach-imx/cpu-imx25.c
- arch/arm/mach-imx/cpu-imx27.c 13 additions, 15 deletionsarch/arm/mach-imx/cpu-imx27.c
- arch/arm/mach-imx/cpu-imx31.c 27 additions, 22 deletionsarch/arm/mach-imx/cpu-imx31.c
- arch/arm/mach-imx/cpu-imx35.c 14 additions, 16 deletionsarch/arm/mach-imx/cpu-imx35.c
- arch/arm/mach-imx/devices-imx27.h 4 additions, 0 deletionsarch/arm/mach-imx/devices-imx27.h
- arch/arm/mach-imx/devices-imx31.h 4 additions, 0 deletionsarch/arm/mach-imx/devices-imx31.h
Loading
Please register or sign in to comment