Merge nommu tree
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 28 Mar 2006 21:05:10 +0000 (22:05 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 28 Mar 2006 21:05:10 +0000 (22:05 +0100)

Trivial merge