Merge branch 'machtypes' into pxa-palm
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 9 Jul 2008 20:34:25 +0000 (21:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 9 Jul 2008 20:34:25 +0000 (21:34 +0100)

Trivial merge