Merge branches 'devel', 'devel-stable', 'fixes' and 'pgt' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 27 May 2011 22:00:30 +0000 (23:00 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 27 May 2011 22:00:30 +0000 (23:00 +0100)

Trivial merge