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)
commit4ec5240ec367a592834385893200dd4fb369354c
tree3ac9a34948049bff79a2b2ce49c0a3c84e35a748
parentf49809fe9b39e22b0f6f75c86295ce216ce3e374
parentb6016b767397258b58163494a869f8f1199e6897
Merge ... /pub/scm/linux/kernel/git/davem/net-2.6
drivers/net/Kconfig