]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://gkernel.bkbits.net/net-drivers-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 16 Apr 2004 09:16:31 +0000 (02:16 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 16 Apr 2004 09:16:31 +0000 (02:16 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
drivers/net/Kconfig

Simple merge