diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-07 16:26:41 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-07 16:26:41 +0100 |
| commit | 66ee156078697cdc013d46aed3b2fee445c325a1 (patch) | |
| tree | cdff6539fa339d4bdf11934778dd93f3c3225dad /arch/ia64 | |
| parent | 946e2ad040000a14b7316fae722e7e65fa09ffe5 (diff) | |
| parent | e22af66fc85a8b008237970da4d9b6910422536b (diff) | |
| parent | 4ed47896935573c8423d05bddda3f269d6e6c613 (diff) | |
Merge branches 'ns9x' and 'machtypes' into devel