Merge branch 'devel-stable' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 19 Oct 2010 21:06:36 +0000 (22:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 19 Oct 2010 21:06:36 +0000 (22:06 +0100)

Trivial merge