aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 4 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 2c1bc6ea22ea..1f8267f1a2ab 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2643,9 +2643,8 @@ S: Maintained
2643F: arch/x86/math-emu/ 2643F: arch/x86/math-emu/
2644 2644
2645FRAME RELAY DLCI/FRAD (Sangoma drivers too) 2645FRAME RELAY DLCI/FRAD (Sangoma drivers too)
2646M: Mike McLagan <mike.mclagan@linux.org>
2647L: netdev@vger.kernel.org 2646L: netdev@vger.kernel.org
2648S: Maintained 2647S: Orphan
2649F: drivers/net/wan/dlci.c 2648F: drivers/net/wan/dlci.c
2650F: drivers/net/wan/sdla.c 2649F: drivers/net/wan/sdla.c
2651 2650
@@ -4415,10 +4414,10 @@ F: net/*/netfilter/
4415F: net/netfilter/ 4414F: net/netfilter/
4416 4415
4417NETLABEL 4416NETLABEL
4418M: Paul Moore <paul.moore@hp.com> 4417M: Paul Moore <paul@paul-moore.com>
4419W: http://netlabel.sf.net 4418W: http://netlabel.sf.net
4420L: netdev@vger.kernel.org 4419L: netdev@vger.kernel.org
4421S: Supported 4420S: Maintained
4422F: Documentation/netlabel/ 4421F: Documentation/netlabel/
4423F: include/net/netlabel.h 4422F: include/net/netlabel.h
4424F: net/netlabel/ 4423F: net/netlabel/
@@ -4463,7 +4462,6 @@ F: include/linux/netdevice.h
4463NETWORKING [IPv4/IPv6] 4462NETWORKING [IPv4/IPv6]
4464M: "David S. Miller" <davem@davemloft.net> 4463M: "David S. Miller" <davem@davemloft.net>
4465M: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> 4464M: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
4466M: "Pekka Savola (ipv6)" <pekkas@netcore.fi>
4467M: James Morris <jmorris@namei.org> 4465M: James Morris <jmorris@namei.org>
4468M: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> 4466M: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
4469M: Patrick McHardy <kaber@trash.net> 4467M: Patrick McHardy <kaber@trash.net>
@@ -4476,7 +4474,7 @@ F: include/net/ip*
4476F: arch/x86/net/* 4474F: arch/x86/net/*
4477 4475
4478NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK) 4476NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
4479M: Paul Moore <paul.moore@hp.com> 4477M: Paul Moore <paul@paul-moore.com>
4480L: netdev@vger.kernel.org 4478L: netdev@vger.kernel.org
4481S: Maintained 4479S: Maintained
4482 4480