• Arnd Bergmann's avatar
    Merge branch 'samsung/cleanup' into next/boards · 421b759b
    Arnd Bergmann authored
    Conflicts:
    	arch/arm/mach-imx/mach-imx6q.c
    	arch/arm/mach-omap2/board-ti8168evm.c
    	arch/arm/mach-s3c64xx/Kconfig
    	arch/arm/mach-tegra/Makefile
    	arch/arm/mach-tegra/board-dt-tegra20.c
    	arch/arm/mach-tegra/common.c
    
    Lots of relatively simple conflicts between the board
    changes and stuff from the arm tree. This pulls in
    the resolution from the samsung/cleanup tree, so we
    don't get conflicting merges.
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    421b759b
board-cm-t35.c 18.7 KB