From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 9 Jan 2012 17:06:36 +0000 (+0000)
Subject: Merge branch 'samsung/cleanup' into next/boards
X-Git-Tag: v3.3-rc1~140^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=421b759b86eb8a914cbbd11f6d09a74f411762c6;p=pandora-kernel.git

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>
---

421b759b86eb8a914cbbd11f6d09a74f411762c6
Reading git-diff-tree failed