• Arnd Bergmann's avatar
    Merge branch 'at91/cleanup5' into next/drivers · 5db45002
    Arnd Bergmann authored
    The at91 cleanups changed a lot of files, this merges in the
    latest cleanups to resolve the conflicts
    
    Conflicts:
    	arch/arm/mach-at91/at91sam9260.c
    	arch/arm/mach-at91/at91sam9261.c
    	arch/arm/mach-at91/at91sam9263.c
    	arch/arm/mach-at91/clock.c
    	arch/arm/mach-at91/clock.h
    	drivers/rtc/Kconfig
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    5db45002
MAINTAINERS 284 KB