Automatic merge of /spare/repo/netdev-2.6 branch skge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/Makefile
index a8a6567180545a58ed7366081d6cfb0454cfa91e,43c441abeff109e49073cf1e7a454f196d007ad8..63c6d1e6d4d982937ada0fdaca07003ec29ef9e6
--- 1/drivers/net/Makefile
--- 2/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -51,8 -51,8 +51,9 @@@ obj-$(CONFIG_NS83820) += ns83820.
  obj-$(CONFIG_STNIC) += stnic.o 8390.o
  obj-$(CONFIG_FEALNX) += fealnx.o
  obj-$(CONFIG_TIGON3) += tg3.o
 +obj-$(CONFIG_BNX2) += bnx2.o
  obj-$(CONFIG_TC35815) += tc35815.o
+ obj-$(CONFIG_SKGE) += skge.o
  obj-$(CONFIG_SK98LIN) += sk98lin/
  obj-$(CONFIG_SKFP) += skfp/
  obj-$(CONFIG_VIA_RHINE) += via-rhine.o