| commit | 421b759b86eb8a914cbbd11f6d09a74f411762c6 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Jan 09 17:06:36 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Jan 09 17:06:36 2012 +0000 |
| tree | 505ca7f23987d8eaaa519a7e8506b854e2c0d030 | |
| parent | e067096c8d57d191f29d734cd5692695c95cc36e [diff] | |
| parent | a07613a54d700a974f3a4a657da78ef5d097315d [diff] |
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>