]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efe00e6 6d1bb7f)
Merge bk://kernel.bkbits.net/davem/tg3-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 14 Jun 2004 06:04:26 +0000 (23:04 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 14 Jun 2004 06:04:26 +0000 (23:04 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge
Linux kernels and configurations used by Zygo.