]> git.hungrycats.org Git - linux/commitdiff
Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Sun, 2 Mar 2003 15:36:16 +0000 (07:36 -0800)
committerDavid S. Miller <davem@nuts.ninka.net>
Sun, 2 Mar 2003 15:36:16 +0000 (07:36 -0800)
into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

1  2 
drivers/net/sunhme.c

Simple merge