git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3353327 531a6a9)
Merge branch 'depends/rmk/devel-stable' into next/board
authorArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 22:58:06 +0000 (23:58 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 23:11:41 +0000 (00:11 +0100)
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>

Trivial merge
Pandora Kernel Repository