tree a95f563e90f19ee0353fc52fdb550811d0816a03
parent 3336f4f08e0dad7a2b6493c80b49b685141d53ad
parent 9faf3c1d0dab9e9f4b0cbd42bc37be515d8b8cb1
author Russell King <rmk+kernel@arm.linux.org.uk> 1259187475 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1259187475 +0000

Merge branch 'mach-types'