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)
commit3fcca9ac6cbce35b3e81e247d375534117d5f4cd
treea95f563e90f19ee0353fc52fdb550811d0816a03
parent3336f4f08e0dad7a2b6493c80b49b685141d53ad
parent9faf3c1d0dab9e9f4b0cbd42bc37be515d8b8cb1
Merge branch 'mach-types'