Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 May 2013 23:48:28 +0000 (16:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 May 2013 23:48:28 +0000 (16:48 -0700)
Merge net into net-next because some upcoming net-next changes
build on top of bug fixes that went into net.

Signed-off-by: David S. Miller <davem@davemloft.net>
1  2 
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/vxlan.c
include/linux/netdevice.h
net/ipv4/tcp.c
net/ipv4/tcp_input.c

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