Merge branch 'fixes' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 May 2007 15:12:12 +0000 (16:12 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 May 2007 15:12:12 +0000 (16:12 +0100)

Trivial merge