Merge branch 'next/cleanup' into samsung/dt
Arnd Bergmann [Sat, 7 Jan 2012 20:21:04 +0000 (20:21 +0000)]
Conflicts:
arch/arm/mach-exynos/common.c

The common.c file gets changes from rmk/stable-devel (part of
next/cleanup), rmk/restart, samsung/dt and follow-on branches
from the samsung tree.

Pulling it all together here hopefully avoids having to do
even more conflicting merge changesets in this one file. What
a mess!

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/mach-msm/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge