Merge branch 'samsung/cleanup' into next/boards
authorArnd Bergmann <arnd@arndb.de>
Mon, 9 Jan 2012 17:06:36 +0000 (17:06 +0000)
committerArnd Bergmann <arnd@arndb.de>
Mon, 9 Jan 2012 17:06:36 +0000 (17:06 +0000)
commit421b759b86eb8a914cbbd11f6d09a74f411762c6
tree505ca7f23987d8eaaa519a7e8506b854e2c0d030
parente067096c8d57d191f29d734cd5692695c95cc36e
parenta07613a54d700a974f3a4a657da78ef5d097315d
Merge branch 'samsung/cleanup' into next/boards

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: Arnd Bergmann <arnd@arndb.de>
23 files changed:
arch/arm/configs/imx_v4_v5_defconfig
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/mach-apf9328.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-imx/mach-mx31_3ds.c
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-ti8168evm.c
arch/arm/mach-omap2/common.h
arch/arm/mach-pxa/mioa701.c
arch/arm/mach-s3c2440/mach-mini2440.c
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-paz00.c
arch/arm/mach-tegra/board-seaboard.c
arch/arm/mach-tegra/board-trimslice.c
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/irq.c
arch/arm/mach-tegra/timer.c
arch/arm/plat-samsung/Kconfig