From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Oct 2011 13:11:34 +0000 (+0100)
Subject: Merge branch 'dt/gic' into highbank/soc
X-Git-Tag: v3.2-rc1~88^2~2^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09fa31a322c8f03871a741cd1d26e5ca04aacbbd;p=pandora-kernel.git

Merge branch 'dt/gic' into highbank/soc

Conflicts:
	arch/arm/Kconfig
---

09fa31a322c8f03871a741cd1d26e5ca04aacbbd
Reading git-diff-tree failed