• Arnd Bergmann's avatar
    Merge branch 'depends/rmk/devel-stable' into next/board · a7fadac1
    Arnd Bergmann authored
    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: default avatarArnd Bergmann <arnd@arndb.de>
    a7fadac1
omixp-setup.c 6.02 KB