• Arnd Bergmann's avatar
    Merge branch 'late/clksrc' into late/cleanup · 442a33eb
    Arnd Bergmann authored
    There is no reason to keep the clksrc cleanups separate from the
    other cleanups, and this resolves some merge conflicts.
    
    Conflicts:
    	arch/arm/mach-spear/spear13xx.c
    	drivers/irqchip/Makefile
    442a33eb
board-am3517evm.c 8.15 KB