aboutsummaryrefslogtreecommitdiff
path: root/arch/arm64
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-12-08 18:27:21 +0100
committerArnd Bergmann <arnd@arndb.de>2014-12-08 18:29:20 +0100
commit5db45002576f7d60c5bf7b23e277845cd3e806be (patch)
tree18cf276c8c0d64c5011784b814db586c0d5476cb /arch/arm64
parent7135466151f0560604c2bfc4c27ff9cc2a40f8cd (diff)
parentba62a8593d15f3f353acdc8ab32c18dd40a275bb (diff)
downloadlinux-5db45002576f7d60c5bf7b23e277845cd3e806be.tar.gz
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>
Diffstat (limited to 'arch/arm64')
0 files changed, 0 insertions, 0 deletions