]> git.neil.brown.name Git - history.git/commitdiff
Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Thu, 3 Apr 2003 07:49:50 +0000 (23:49 -0800)
committerDavid S. Miller <davem@nuts.ninka.net>
Thu, 3 Apr 2003 07:49:50 +0000 (23:49 -0800)
into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

1  2 
kernel/module.c

diff --cc kernel/module.c
Simple merge