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