Merge branch 'nomadik' into devel-stable
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Sep 2009 10:50:52 +0000 (11:50 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Sep 2009 10:50:52 +0000 (11:50 +0100)

Trivial merge