Merge branches 'devel', 'devel-stable' and 'fixes' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 27 May 2011 21:59:57 +0000 (22:59 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 27 May 2011 21:59:57 +0000 (22:59 +0100)

Trivial merge