• Arnd Bergmann's avatar
    Merge branch 'depends/rmk/for-linus' into samsung/dt · 237c78be
    Arnd Bergmann authored
    Conflicts:
    	arch/arm/mach-exynos/Makefile
    	arch/arm/mach-exynos/cpu.c -> common.c
    	arch/arm/mach-exynos/include/mach/entry-macro.S
    	arch/arm/mach-exynos/init.c -> common.c
    	arch/arm/mach-s5p64x0/init.c -> common.c
    	arch/arm/mach-s5pv210/init.c -> common.c
    
    Multiple files were moved into common.c files in the rmk/for-linus
    branch, so this moves over the samsung/dt changes to the new
    files.
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    237c78be
mach-osiris.c 10.1 KB