From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 20 Nov 2014 13:02:34 +0000 (+0100)
Subject: Merge branch 'at91/cleanup' into next/drivers
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~13^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b3d4d3d2d69c29c09c38dbc99b4e2225724955a;p=pandora-kernel.git

Merge branch 'at91/cleanup' into next/drivers

This resolves some of the obvious conflicts between the at91 cleanup and
drivers branches.

Conflicts:
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	drivers/rtc/Kconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

4b3d4d3d2d69c29c09c38dbc99b4e2225724955a
Reading git-diff-tree failed