Merge branch 'depends/rmk/for-linus' into samsung/dt
authorArnd Bergmann <arnd@arndb.de>
Sat, 7 Jan 2012 12:30:20 +0000 (12:30 +0000)
committerArnd Bergmann <arnd@arndb.de>
Sat, 7 Jan 2012 12:42:17 +0000 (12:42 +0000)
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>

Trivial merge