Merge /spare/repo/linux-2.6/

diff --cc drivers/net/Kconfig
index 0313af45c1ecd0a1b601276ec518a6348e8f33e5,79e8aa6f2b9edfc215e43b1a1b0a934274a680f4..a6a441b969fdda06df05da14a46c7d9b1582ab31
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -2089,27 -2091,8 +2091,27 @@@ endmen
  #
  
  menu "Ethernet (10000 Mbit)"
-       depends on NETDEVICES && !UML
+       depends on !UML
  
 +config CHELSIO_T1
 +        tristate "Chelsio 10Gb Ethernet support"
 +        depends on PCI
 +        help
 +          This driver supports Chelsio N110 and N210 models 10Gb Ethernet
 +          cards. More information about adapter features and performance
 +          tuning is in <file:Documentation/networking/cxgb.txt>.
 +
 +          For general information about Chelsio and our products, visit
 +          our website at <http://www.chelsio.com>.
 +
 +          For customer support, please visit our customer support page at
 +          <http://www.chelsio.com/support.htm>.
 +
 +          Please send feedback to <linux-bugs@chelsio.com>.
 +
 +          To compile this driver as a module, choose M here: the module
 +          will be called cxgb.
 +
  config IXGB
        tristate "Intel(R) PRO/10GbE support"
        depends on PCI

diff --cc drivers/net/Makefile
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge