Merge /spare/repo/linux-2.6/

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/Makefile
index 7e5c0d46d5053573ec0d93bfffbcaacc78bc6fd5,8645c843cf4d0216c8e8e4a53b202d7a576c2b07..c849afc25c000a45f3104cde3af424cd0e7bef04
--- 1/drivers/net/Makefile
--- 2/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -52,9 -54,10 +54,11 @@@ obj-$(CONFIG_STNIC) += stnic.o 8390.
  obj-$(CONFIG_FEALNX) += fealnx.o
  obj-$(CONFIG_TIGON3) += tg3.o
  obj-$(CONFIG_BNX2) += bnx2.o
+ spidernet-y += spider_net.o spider_net_ethtool.o sungem_phy.o
+ obj-$(CONFIG_SPIDER_NET) += spidernet.o
  obj-$(CONFIG_TC35815) += tc35815.o
  obj-$(CONFIG_SKGE) += skge.o
 +obj-$(CONFIG_SKY2) += sky2.o
  obj-$(CONFIG_SK98LIN) += sk98lin/
  obj-$(CONFIG_SKFP) += skfp/
  obj-$(CONFIG_VIA_RHINE) += via-rhine.o