]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d572f1a c1d567a)
Merge master.kernel.org:/home/acme/BK/newdatalink-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Wed, 14 Aug 2002 14:10:40 +0000 (07:10 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Wed, 14 Aug 2002 14:10:40 +0000 (07:10 -0700)
into nuts.ninka.net:/home/davem/src/BK/net-2.5

1  2 
net/llc/llc_main.c patch | diff1 | diff2 | blob | history

diff --cc net/llc/llc_main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.