]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eeb059e 6967bd8)
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 7 Feb 2006 18:04:04 +0000 (10:04 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 7 Feb 2006 18:04:04 +0000 (10:04 -0800)

Trivial merge
Linux 2.6 source tree