Merge remote-tracking branch 'net-next/master'

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-at91/Kconfig
Simple merge

diff --cc arch/cris/include/uapi/asm/socket.h
Simple merge

diff --cc arch/m68k/include/uapi/asm/socket.h
Simple merge

diff --cc arch/parisc/include/uapi/asm/socket.h
Simple merge

diff --cc arch/xtensa/include/uapi/asm/socket.h
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qla3xxx.c
Simple merge

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

diff --cc drivers/net/ethernet/ti/Kconfig
Simple merge

diff --cc drivers/net/usb/smsc95xx.c
Simple merge

diff --cc drivers/net/usb/usbnet.c
Simple merge

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

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

diff --cc include/uapi/linux/usb/cdc.h
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc net/sctp/socket.c
Simple merge