Merge nommu tree
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 26 Apr 2006 20:18:45 +0000 (21:18 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 26 Apr 2006 20:18:45 +0000 (21:18 +0100)

Trivial merge