Merge branch 'merge-fixes' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 19 Apr 2008 16:17:34 +0000 (17:17 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 19 Apr 2008 16:17:34 +0000 (17:17 +0100)

Trivial merge