]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50da7d0 15fea12)
Merge master.kernel.org:/home/davem/BK/net-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Thu, 6 Jun 2002 02:19:46 +0000 (19:19 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Thu, 6 Jun 2002 02:19:46 +0000 (19:19 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
CREDITS patch | diff1 | diff2 | blob | history
net/core/dev.c patch | diff1 | diff2 | blob | history

diff --cc CREDITS
Simple merge
diff --cc net/core/dev.c
Simple merge
Linux kernels and configurations used by Zygo.