netfilter: add and use nf_ct_set helper

[mirror_ubuntu-artful-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 979126a9a150028d26b3531fd5715833dbedc0b4..11904a95672ae22dfc0ccd9c5bfc9ea265e77dcc 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2605,6 +2605,12 @@ L:       netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bnx2x/
 
+BROADCOM BNXT_EN 50 GIGABIT ETHERNET DRIVER
+M:     Michael Chan <michael.chan@broadcom.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/broadcom/bnxt/
+
 BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
 M:     Florian Fainelli <f.fainelli@gmail.com>
 M:     Ray Jui <rjui@broadcom.com>
@@ -5735,7 +5741,7 @@ S:        Maintained
 F:     drivers/media/dvb-frontends/hd29l2*
 
 HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER
-M:     Brian Boylston <brian.boylston@hpe.com>
+M:     Jimmy Vance <jimmy.vance@hpe.com>
 S:     Supported
 F:     Documentation/watchdog/hpwdt.txt
 F:     drivers/watchdog/hpwdt.c
@@ -8828,7 +8834,7 @@ T:        git git://github.com/jonmason/ntb.git
 F:     drivers/ntb/hw/intel/
 
 NTB AMD DRIVER
-M:     Xiangliang Yu <Xiangliang.Yu@amd.com>
+M:     Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 L:     linux-ntb@googlegroups.com
 S:     Supported
 F:     drivers/ntb/hw/amd/