Arnd Bergmann 421b759b86 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>		2012-01-09 17:06:36 +00:00
..
bootp	ARM: 6499/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in bootp/init.S	2010-11-30 13:44:24 +00:00
compressed	Merge branch 'devel-stable' into for-linus	2012-01-05 13:24:33 +00:00
dts	Merge branch 'samsung/cleanup' into next/boards	2012-01-09 17:06:36 +00:00
.gitignore
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
Makefile	ARM: 7152/1: distclean: Remove generated .dtb files	2011-11-08 18:25:04 +00:00