Merge branch 'devel-stable' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 9 Aug 2010 13:09:29 +0000 (14:09 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 9 Aug 2010 13:09:29 +0000 (14:09 +0100)

Trivial merge