Merge branch 'dt/gic' into highbank/soc
authorArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 13:11:34 +0000 (14:11 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 13:11:34 +0000 (14:11 +0100)
Conflicts:
arch/arm/Kconfig


Trivial merge