| commit | a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 23:58:06 2011 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Nov 01 00:11:41 2011 +0100 |
| tree | 64a1035b02cb8aae34b96fc7c1c7caaad337ac07 | |
| parent | 335332770c68649ffeaf5dc2b58d9cd40041e295 [diff] | |
| parent | 531a6a941745e1e045dd2a6bd09e1dc01247a5f3 [diff] |
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>