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

Conflicts:
	drivers/net/sfc/net_driver.h
	drivers/net/sfc/siena.c

diff --cc drivers/net/benet/be_cmds.c
Simple merge

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

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

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

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

diff --cc drivers/net/sfc/net_driver.h
Simple merge

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

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

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

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

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

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

diff --cc net/mac80211/rx.c
Simple merge