From: Arnd Bergmann Date: Sat, 7 Jan 2012 20:21:04 +0000 (+0000) Subject: Merge branch 'next/cleanup' into samsung/dt X-Git-Tag: upstream/snapshot3+hdmi~8411^2^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=928a11ba36f999436915ea2b1eadf54301f93059;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'next/cleanup' into samsung/dt 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 --- 928a11ba36f999436915ea2b1eadf54301f93059