Arnd Bergmann 5db4500257 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>		2014-12-08 18:29:20 +01:00
..
at91	ARM: at91: move sdramc/ddrsdr header to include/soc/at91	2014-11-13 12:03:44 +01:00
tegra	memory: Add NVIDIA Tegra memory controller support	2014-12-04 16:11:47 +01:00