]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ef7734 1e3cc3f)
Merge bk://kernel.bkbits.net/davem/net-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 4 Oct 2004 15:16:24 +0000 (08:16 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 4 Oct 2004 15:16:24 +0000 (08:16 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge
Linux kernels and configurations used by Zygo.