| commit | 63ae0e5be34cb7593fc5f1135422129f765ac3ef | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Feb 26 11:40:46 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Feb 26 11:40:46 2007 -0800 |
| tree | 9ad9a84db71255793b60890683998527fd474769 | |
| parent | a22a0fab32e1216df56e4b9a577dc5c922cf7524 [diff] | |
| parent | 2e8e2d49b14cce7bae910d22d59d2f282761e0d3 [diff] |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix port 0 mac address for mips mv6434x platforms [SERIAL] serial_txx9 driver update Revert "[PATCH] Generic ioremap_page_range: mips conversion" [MIPS] Cobalt: Rename "Colo" MTD partition to "firmware". [MIPS] SMP: Get smp_tune_scheduling to do something useful. [MIPS] Add basic SMARTMIPS ASE support