| commit | dd472546edefe0d48613c466b110533514e20455 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Nov 01 12:00:22 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Nov 01 12:00:22 2006 -0800 |
| tree | 7d54767ff5f82cdf12ae864b317d349b7f5976f8 | |
| parent | f9dadfa71bc594df09044da61d1c72701121d802 [diff] | |
| parent | 67cac1eba7eee92e2b25c1e8e4737968dc7c8522 [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 warning in mips-boards generic PCI [MIPS] SMTC: Synchronize cp0 counters on bootup. [MIPS] SMTC: Fix crash if # of TC's > # of VPE's after pt_regs irq cleanup. [MIPS] 16K & 64K page size fixes