tree 18cf276c8c0d64c5011784b814db586c0d5476cb
parent 7135466151f0560604c2bfc4c27ff9cc2a40f8cd
parent ba62a8593d15f3f353acdc8ab32c18dd40a275bb
author Arnd Bergmann <arnd@arndb.de> 1418059641 +0100
committer Arnd Bergmann <arnd@arndb.de> 1418059760 +0100

Merge branch 'at91/cleanup5' into next/drivers

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: Arnd Bergmann <arnd@arndb.de>