From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 8 Dec 2014 17:27:21 +0000 (+0100)
Subject: Merge branch 'at91/cleanup5' into next/drivers
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~13^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5db45002576f7d60c5bf7b23e277845cd3e806be;p=pandora-kernel.git

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>
---

5db45002576f7d60c5bf7b23e277845cd3e806be
Reading git-diff-tree failed