Merge branch 'machtypes' into orion
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 7 Jul 2008 21:21:34 +0000 (22:21 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 7 Jul 2008 21:21:34 +0000 (22:21 +0100)

Trivial merge