From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Oct 2011 22:58:06 +0000 (+0100)
Subject: Merge branch 'depends/rmk/devel-stable' into next/board
X-Git-Tag: v3.2-rc1~93^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf;p=pandora-kernel.git

Merge branch 'depends/rmk/devel-stable' into next/board

The exynos4 updates conflict with code from the arm devel-stable branch
and new boards need to set atag_offset in place of boot_param.

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-exynos4/include/mach/entry-macro.S
	arch/arm/mach-exynos4/mach-smdkc210.c
	arch/arm/mach-exynos4/mach-smdkv310.c
	arch/arm/mach-exynos4/mct.c

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

a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf
Reading git-diff-tree failed