Merge branches 'ns9x' and 'machtypes' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 7 Jul 2008 15:26:41 +0000 (16:26 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 7 Jul 2008 15:26:41 +0000 (16:26 +0100)
commit66ee156078697cdc013d46aed3b2fee445c325a1
treecdff6539fa339d4bdf11934778dd93f3c3225dad
parent946e2ad040000a14b7316fae722e7e65fa09ffe5
parente22af66fc85a8b008237970da4d9b6910422536b
parent4ed47896935573c8423d05bddda3f269d6e6c613
Merge branches 'ns9x' and 'machtypes' into devel