• Arnd Bergmann's avatar
    Merge branch 'samsung/dt' into samsung/cleanup · a07613a5
    Arnd Bergmann authored
    Conflicts:
    	arch/arm/mach-s3c64xx/Makefile
    	arch/arm/mach-s5pc100/Makefile
    	arch/arm/mach-s5pv210/Makefile
    
    Pull in previously resolved conflicts:
    
    The Makefiles were reorganized in the "rmk/restart" series and modified
    in the "samsung/cleanup series". This also pulls in the other conflict
    resolutions from the restart series against the samsung/dt series.
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    a07613a5
mach-nuri.c 34.6 KB