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

Conflicts:
	drivers/net/e1000/e1000_main.c

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

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

diff --cc drivers/net/sfc/efx.c
Simple merge

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

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

diff --cc drivers/net/sfc/sfe4001.c
Simple merge

diff --cc drivers/net/sfc/tenxpress.c
Simple merge

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

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

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

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

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

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

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