| commit | 09fa31a322c8f03871a741cd1d26e5ca04aacbbd | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 14:11:34 2011 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 14:11:34 2011 +0100 |
| tree | acdad13d7c332978a91231c4f34b6320a1c7ceb6 | |
| parent | 2b228e8cf33dbdd323dd4a05a973c6bd45c44133 [diff] | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef [diff] |
Merge branch 'dt/gic' into highbank/soc Conflicts: arch/arm/Kconfig