Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Fri, 30 Jan 2009 22:31:07 +0000 (14:31 -0800)]
Conflicts:
drivers/net/e1000/e1000_main.c

14 files changed:
1  2 
drivers/net/e1000/e1000_main.c
drivers/net/r6040.c
drivers/net/sfc/efx.c
drivers/net/sfc/efx.h
drivers/net/sfc/net_driver.h
drivers/net/sfc/sfe4001.c
drivers/net/sfc/tenxpress.c
drivers/net/smsc911x.c
drivers/net/smsc9420.c
drivers/net/ucc_geth.c
drivers/net/virtio_net.c
include/net/inet_hashtables.h
net/core/skbuff.c
net/ipv4/tcp.c

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