Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

diff --cc drivers/net/bonding/bond_alb.c
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

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

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

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

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

diff --cc drivers/net/qlge/qlge_main.c
Simple merge

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

diff --cc drivers/net/usb/usbnet.c
Simple merge

diff --cc drivers/net/vxge/vxge-main.c
Simple merge

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

diff --cc drivers/vhost/vhost.c
Simple merge

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

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

diff --cc include/net/sch_generic.h
Simple merge

diff --cc net/bridge/br_netfilter.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/ethtool.c
Simple merge

diff --cc net/ipv4/xfrm4_policy.c
Simple merge

diff --cc net/ipv6/ndisc.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge