Merge branch 'devel-stable' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Oct 2010 19:39:13 +0000 (20:39 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Oct 2010 19:39:13 +0000 (20:39 +0100)

Trivial merge