Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (54 commits)
  ipv6: check for IPv4 mapped addresses when connecting IPv6 sockets
  mlx4: decreasing ref count when removing mac
  net: Fix security_socket_sendmsg() bypass problem.
  net: Cap number of elements for sendmmsg
  net: sendmmsg should only return an error if no messages were sent
  ixgbe: fix PHY link setup for 82599
  ixgbe: fix __ixgbe_notify_dca() bail out code
  igb: fix WOL on second port of i350 device
  e1000e: minor re-order of #include files
  e1000e: remove unnecessary check for NULL pointer
  intel drivers: repair missing flush operations
  macb: restore wrap bit when performing underrun cleanup
  cdc_ncm: fix endianness problem.
  irda: use PCI_VENDOR_ID_*
  mlx4: Fixing Ethernet unicast packet steering
  net: fix NULL dereferences in check_peer_redir()
  bnx2x: Clear MDIO access warning during first driver load
  bnx2x: Fix BCM578xx MAC test
  bnx2x: Fix BCM54618se invalid link indication
  bnx2x: Fix BCM84833 link
  ...

1 files changed, 4 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 07cfd8deaad5..51d42fbc8dc4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2643,9 +2643,8 @@ S:	Maintained
 F:      arch/x86/math-emu/
 
 FRAME RELAY DLCI/FRAD (Sangoma drivers too)
-M:      Mike McLagan <mike.mclagan@linux.org>
 L:      netdev@vger.kernel.org
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wan/dlci.c
 F:      drivers/net/wan/sdla.c
 
@@ -4415,10 +4414,10 @@ F:	net/*/netfilter/
 F:      net/netfilter/
 
 NETLABEL
-M:      Paul Moore <paul.moore@hp.com>
+M:      Paul Moore <paul@paul-moore.com>
 W:      http://netlabel.sf.net
 L:      netdev@vger.kernel.org
-S:      Supported
+S:      Maintained
 F:      Documentation/netlabel/
 F:      include/net/netlabel.h
 F:      net/netlabel/
@@ -4463,7 +4462,6 @@ F:	include/linux/netdevice.h
 NETWORKING [IPv4/IPv6]
 M:      "David S. Miller" <davem@davemloft.net>
 M:      Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
-M:      "Pekka Savola (ipv6)" <pekkas@netcore.fi>
 M:      James Morris <jmorris@namei.org>
 M:      Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
 M:      Patrick McHardy <kaber@trash.net>
@@ -4476,7 +4474,7 @@ F:	include/net/ip*
 F:      arch/x86/net/*
 
 NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
-M:      Paul Moore <paul.moore@hp.com>
+M:      Paul Moore <paul@paul-moore.com>
 L:      netdev@vger.kernel.org
 S:      Maintained