Merge /spare/repo/linux-2.6/

diff --cc drivers/net/8139cp.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/e100.c
Simple merge

diff --cc drivers/net/e1000/e1000_main.c
Simple merge

diff --cc drivers/net/ixgb/ixgb_main.c
Simple merge

diff --cc drivers/net/skge.c
Simple merge