Merge branches 'ns9x' and 'machtypes' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 7 Jul 2008 15:26:41 +0000 (16:26 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 7 Jul 2008 15:26:41 +0000 (16:26 +0100)

Trivial merge