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

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc include/uapi/linux/usb/cdc.h
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/ipv6/route.c
Simple merge