projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f9dadfa
67cac1e
)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
author
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 1 Nov 2006 20:00:22 +0000
(12:00 -0800)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 1 Nov 2006 20:00:22 +0000
(12:00 -0800)
* '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
Trivial merge