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

Conflicts:
	arch/h8300/include/uapi/asm/socket.h
	arch/parisc/include/uapi/asm/socket.h

diff --cc MAINTAINERS
Simple merge

diff --cc arch/parisc/include/uapi/asm/socket.h
index 9f2174f42e379e149d01733b22fdc35cc44fa1d5,7c614d01f1fa42df36a23b3633f6d6ae7d47aa6a..f33113a6141e7540da2195cc72469152edfbecf2
--- 1/arch/parisc/include/uapi/asm/socket.h
--- 2/arch/parisc/include/uapi/asm/socket.h
+++ b/arch/parisc/include/uapi/asm/socket.h
@@@ -75,4 -75,11 +75,6 @@@
  
  #define SO_BUSY_POLL          0x4027
  
 -/* O_NONBLOCK clashes with the bits used for socket types.  Therefore we
 - * have to define SOCK_NONBLOCK to a different value here.
 - */
 -#define SOCK_NONBLOCK   0x40000000
 -
 -#endif /* _ASM_SOCKET_H */
+ #define SO_MAX_PACING_RATE    0x4048
+ 
 +#endif /* _UAPI_ASM_SOCKET_H */

diff --cc drivers/net/ethernet/amd/declance.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/b44.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/brocade/bna/bnad.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

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

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00mac.c
Simple merge

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

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

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