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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
  be2net: Add detect UE feature for Lancer
  be2net: Prevent CQ full condition for Lancer
  be2net: Fix disabling multicast promiscous mode
  be2net: Fix endian issue in RX filter command
  af_packet: de-inline some helper functions
  MAINTAINERS: Add can-gw include to maintained files
  net: Add back alignment for size for __alloc_skb
  net: add missing bh_unlock_sock() calls
  l2tp: fix race in l2tp_recv_dequeue()
  ixgbevf: Update release version
  ixgbe: DCB, return max for IEEE traffic classes
  ixgbe: fix reading of the buffer returned by the firmware
  ixgbe: Fix compiler warnings
  ixgbe: fix smatch splat due to missing NULL check
  ixgbe: fix disabling of Tx laser at probe
  ixgbe: Fix link issues caused by a reset while interface is down
  igb: Fix for I347AT4 PHY cable length unit detection
  e100: make sure vlan support isn't advertised on old adapters
  e1000e: demote a debugging WARN to a debug log message
  net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c
  ...

1 files changed, 2 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index ab7767001286..a6afe342f0fc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1716,6 +1716,7 @@ F:	include/linux/can.h
 F:      include/linux/can/core.h
 F:      include/linux/can/bcm.h
 F:      include/linux/can/raw.h
+F:      include/linux/can/gw.h
 
 CAN NETWORK DRIVERS
 M:      Wolfgang Grandegger <wg@grandegger.com>
@@ -4476,11 +4477,9 @@ F:	Documentation/networking/vxge.txt
 F:      drivers/net/ethernet/neterion/
 
 NETFILTER/IPTABLES/IPCHAINS
-P:      Rusty Russell
-P:      Marc Boucher
-P:      James Morris
 P:      Harald Welte
 P:      Jozsef Kadlecsik
+M:      Pablo Neira Ayuso <pablo@netfilter.org>
 M:      Patrick McHardy <kaber@trash.net>
 L:      netfilter-devel@vger.kernel.org
 L:      netfilter@vger.kernel.org