aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2011-11-01 04:44:56 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2011-11-01 04:49:03 -0400
commit0e05e192c0ff706ee2a12eb65074085e3967d862 (patch)
tree70409e0bbe8213ba190357e29c36eceff50bb810 /MAINTAINERS
parent2dad81adf2c49aa9f8bb7e7c48dff9261bd58396 (diff)
MAINTAINERS: update netfilter maintainers
Marc Boucher, James Morris and Rusty Russell were crucial in the early netfilter days. We thank them all! However, they are not actively maintaining netfilter anymore. This patch adds myself as netfilter maintainer. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 1 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4befa126852e..8edf72bba65f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4452,11 +4452,9 @@ F: Documentation/networking/vxge.txt
4452F: drivers/net/ethernet/neterion/ 4452F: drivers/net/ethernet/neterion/
4453 4453
4454NETFILTER/IPTABLES/IPCHAINS 4454NETFILTER/IPTABLES/IPCHAINS
4455P: Rusty Russell
4456P: Marc Boucher
4457P: James Morris
4458P: Harald Welte 4455P: Harald Welte
4459P: Jozsef Kadlecsik 4456P: Jozsef Kadlecsik
4457M: Pablo Neira Ayuso <pablo@netfilter.org>
4460M: Patrick McHardy <kaber@trash.net> 4458M: Patrick McHardy <kaber@trash.net>
4461L: netfilter-devel@vger.kernel.org 4459L: netfilter-devel@vger.kernel.org
4462L: netfilter@vger.kernel.org 4460L: netfilter@vger.kernel.org