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)

Trivial merge