Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 10 Nov 2012 23:32:51 +0000 (18:32 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sat, 10 Nov 2012 23:32:51 +0000 (18:32 -0500)
commitd4185bbf62a5d8d777ee445db1581beb17882a07
tree024b0badbd7c970b1983be6d8c345cc4a290cb31
parentc075b13098b399dc565b4d53f42047a8d40ed3ba
parenta375413311b39005ef281bfd71ae8f4e3df22e97
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
34 files changed:
MAINTAINERS
arch/arm/mach-at91/Kconfig
arch/m68k/include/uapi/asm/socket.h
arch/parisc/include/uapi/asm/socket.h
arch/xtensa/include/uapi/asm/socket.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/freescale/gianfar.c
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
drivers/net/ethernet/micrel/ksz884x.c
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
drivers/net/ethernet/qlogic/qla3xxx.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/ethernet/ti/Kconfig
drivers/net/usb/smsc95xx.c
drivers/net/usb/usbnet.c
drivers/net/vmxnet3/vmxnet3_drv.c
drivers/net/vxlan.c
drivers/vhost/net.c
include/uapi/linux/usb/cdc.h
net/core/dev.c
net/core/rtnetlink.c
net/core/skbuff.c
net/ipv4/inet_diag.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_minisocks.c
net/ipv4/tcp_timer.c
net/ipv6/ip6_gre.c
net/ipv6/ndisc.c
net/ipv6/route.c
net/sctp/socket.c