Arnd Bergmann 237c78beb8 Merge branch 'depends/rmk/for-linus' into samsung/dt ... Conflicts: arch/arm/mach-exynos/Makefile arch/arm/mach-exynos/cpu.c -> common.c arch/arm/mach-exynos/include/mach/entry-macro.S arch/arm/mach-exynos/init.c -> common.c arch/arm/mach-s5p64x0/init.c -> common.c arch/arm/mach-s5pv210/init.c -> common.c Multiple files were moved into common.c files in the rmk/for-linus branch, so this moves over the samsung/dt changes to the new files. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 12:42:17 +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	ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN	2011-12-23 10:07:12 +09:00
.gitignore	[ARM] 4449/1: more entries in arch/arm/boot/.gitignore	2007-06-25 20:37:35 +01:00
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