]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f9dadfa 67cac1e)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Nov 2006 20:00:22 +0000 (12:00 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Nov 2006 20:00:22 +0000 (12:00 -0800)
commitdd472546edefe0d48613c466b110533514e20455
tree7d54767ff5f82cdf12ae864b317d349b7f5976f8tree | snapshot
parentf9dadfa71bc594df09044da61d1c72701121d802commit | diff
parent67cac1eba7eee92e2b25c1e8e4737968dc7c8522commit | 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
Linux 2.6 source tree