]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63f29ea bc5359b)
Merge master.kernel.org:/home/davem/BK/net-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Wed, 1 May 2002 03:38:52 +0000 (20:38 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Wed, 1 May 2002 03:38:52 +0000 (20:38 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
Makefile patch | diff1 | diff2 | blob | history
drivers/net/Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc drivers/net/Makefile
Simple merge
Linux kernels and configurations used by Zygo.