| commit | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jan 05 12:55:03 2012 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jan 05 12:55:03 2012 +0000 |
| tree | a14ad6c652736bb28859a7aec392a01b236ae58d | |
| parent | cc511b8d84d88ab788cddbfe8d21485b1c387493 [diff] | |
| parent | 2e3d256de9d3db5a7ca19b61305627a516b54b45 [diff] |
Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD Conflicts: arch/arm/plat-omap/include/plat/common.h