diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-16 13:01:52 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-18 11:27:03 +0200 |
| commit | db9cf3a345d310bd459f369e8fa5f039076293f2 (patch) | |
| tree | 43d3a6362ea5fb0a69d9ab002da2bea8697bd2eb /MAINTAINERS | |
| parent | 945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f (diff) | |
| download | linux-stable-db9cf3a345d310bd459f369e8fa5f039076293f2.tar.gz linux-stable-db9cf3a345d310bd459f369e8fa5f039076293f2.tar.bz2 linux-stable-db9cf3a345d310bd459f369e8fa5f039076293f2.zip | |
MAINTAINERS: merge ebtables into netfilter entry
Moreover, remove reference to the netfilter users mailing list,
so they don't receive patches.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 134483f206e4..2d67a5d094a2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3189,14 +3189,6 @@ L: linux-scsi@vger.kernel.org S: Maintained F: drivers/scsi/eata_pio.* -EBTABLES -L: netfilter-devel@vger.kernel.org -W: http://ebtables.sourceforge.net/ -S: Orphan -F: include/linux/netfilter_bridge/ebt_*.h -F: include/uapi/linux/netfilter_bridge/ebt_*.h -F: net/bridge/netfilter/ebt*.c - EC100 MEDIA DRIVER M: Antti Palosaari <crope@iki.fi> L: linux-media@vger.kernel.org @@ -6105,12 +6097,11 @@ F: Documentation/networking/s2io.txt F: Documentation/networking/vxge.txt F: drivers/net/ethernet/neterion/ -NETFILTER/IPTABLES +NETFILTER ({IP,IP6,ARP,EB,NF}TABLES) M: Pablo Neira Ayuso <pablo@netfilter.org> M: Patrick McHardy <kaber@trash.net> M: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> L: netfilter-devel@vger.kernel.org -L: netfilter@vger.kernel.org L: coreteam@netfilter.org W: http://www.netfilter.org/ W: http://www.iptables.org/ |