]> git.hungrycats.org Git - linux/commitdiff
Merge nuts.ninka.net:/disk1/davem/BK/net-2.5
authorDavid S. Miller <davem@kernel.bkbits.net>
Tue, 2 Sep 2003 08:05:20 +0000 (01:05 -0700)
committerDavid S. Miller <davem@kernel.bkbits.net>
Tue, 2 Sep 2003 08:05:20 +0000 (01:05 -0700)
into kernel.bkbits.net:/home/davem/net-2.5

1  2 
drivers/net/Kconfig

Simple merge