Merge branches 'fixes' and 'devel-stable' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 29 Mar 2011 20:54:54 +0000 (21:54 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 29 Mar 2011 20:54:54 +0000 (21:54 +0100)

Trivial merge