Merge branch 'cache' (early part)
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 17 Dec 2009 23:22:23 +0000 (23:22 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 17 Dec 2009 23:22:23 +0000 (23:22 +0000)

Trivial merge