]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1a8e6c b38c739)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 7 Feb 2006 18:10:09 +0000 (10:10 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 7 Feb 2006 18:10:09 +0000 (10:10 -0800)

Trivial merge
Linux 2.6 source tree