• Arnd Bergmann's avatar
    Merge branch 'spear/dt' into spear/clock · 66a2886d
    Arnd Bergmann authored
    Conflicts:
    	arch/arm/mach-spear3xx/clock.c
    	arch/arm/mach-spear3xx/include/mach/generic.h
    	arch/arm/mach-spear3xx/include/mach/misc_regs.h
    	arch/arm/mach-spear3xx/spear320.c
    	arch/arm/mach-spear6xx/clock.c
    	arch/arm/mach-spear6xx/include/mach/misc_regs.h
    
    Resolve even more merge conflicts.
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    66a2886d
time.c 5.78 KB