tree acdad13d7c332978a91231c4f34b6320a1c7ceb6
parent 2b228e8cf33dbdd323dd4a05a973c6bd45c44133
parent f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef
author Arnd Bergmann <arnd@arndb.de> 1320066694 +0100
committer Arnd Bergmann <arnd@arndb.de> 1320066694 +0100

Merge branch 'dt/gic' into highbank/soc

Conflicts:
	arch/arm/Kconfig