From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 7 Jan 2012 12:30:20 +0000 (+0000)
Subject: Merge branch 'depends/rmk/for-linus' into samsung/dt
X-Git-Tag: v3.3-rc1~143^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=237c78beb8a988453bac1993d21f025d070a0d8d;p=pandora-kernel.git

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

237c78beb8a988453bac1993d21f025d070a0d8d
Reading git-diff-tree failed