Merge branch 'devel-stable' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 5 Dec 2009 10:35:33 +0000 (10:35 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 5 Dec 2009 10:35:33 +0000 (10:35 +0000)

Trivial merge