Merge branch 'cache-louis' of git://linux-arm.org/linux-2.6-lp into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 26 Sep 2012 21:42:18 +0000 (22:42 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 26 Sep 2012 21:42:18 +0000 (22:42 +0100)

Trivial merge