Merge branches 'l2', 'pgt2' and 'misc' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 27 Mar 2012 10:29:31 +0000 (11:29 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 27 Mar 2012 10:29:31 +0000 (11:29 +0100)

Trivial merge