From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 May 2011 01:41:40 +0000 (+1000)
Subject: Merge remote-tracking branch 'unicore32/unicore32'
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21b47e5e82ac94fdae99c6f3349cba041c85017a;p=pandora-kernel.git

Merge remote-tracking branch 'unicore32/unicore32'

Conflicts:
	drivers/rtc/Kconfig
---

21b47e5e82ac94fdae99c6f3349cba041c85017a
Reading git-diff-tree failed