Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 26 May 2005 20:54:33 +0000 (13:54 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 26 May 2005 20:54:33 +0000 (13:54 -0700)
1  2 
drivers/net/Kconfig

Simple merge