From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 20 Nov 2009 17:51:21 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
X-Git-Tag: firefly_0821_release~9833^2~3964^2~1^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ef1a68848a968f7347cf7eea24072464059af8f1;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable

Conflicts:
	arch/arm/mach-at91/Kconfig
---

ef1a68848a968f7347cf7eea24072464059af8f1