Merge ARM fixes
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 20 Feb 2007 19:13:30 +0000 (19:13 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 20 Feb 2007 19:13:30 +0000 (19:13 +0000)

Trivial merge