Merge branch 'amba' into for-armsoc
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 26 Jan 2012 19:59:44 +0000 (19:59 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 26 Jan 2012 19:59:44 +0000 (19:59 +0000)
commitdcf81c1af839b77b44404453ecae6e5ac5a75f05
tree289dcbda5fbca34e7e0cf028908b9b517fa8b8b2
parent34e5f4f198ddd36a82dc12164de7fc4f5430e09d
parent75c06963dd947252271ffa6107a25cddb2b8f362
Merge branch 'amba' into for-armsoc