Merge branch 'mach-types'
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 25 Nov 2009 22:17:55 +0000 (22:17 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 25 Nov 2009 22:17:55 +0000 (22:17 +0000)

Trivial merge