• Arnd Bergmann's avatar
    Merge branch 'depends/rmk/restart' into next/cleanup · 40ba95fd
    Arnd Bergmann authored
    Conflicts:
    	arch/arm/mach-at91/at91cap9.c
    	arch/arm/mach-at91/at91sam9260.c
    	arch/arm/mach-at91/at91sam9261.c
    	arch/arm/mach-at91/at91sam9263.c
    	arch/arm/mach-at91/at91sam9g45.c
    	arch/arm/mach-at91/at91sam9rl.c
    	arch/arm/mach-exynos/cpu.c
    	arch/arm/mach-shmobile/board-kota2.c
    
    This resolves a bunch of conflicts between the arm-soc tree
    and changes from the arm tree that have gone upstream.
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    40ba95fd
u300.c 1.42 KB