summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2011-11-01 09:44:56 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2011-11-01 09:49:03 +0100
commit0e05e192c0ff706ee2a12eb65074085e3967d862 (patch)
tree70409e0bbe8213ba190357e29c36eceff50bb810 /MAINTAINERS
parent2dad81adf2c49aa9f8bb7e7c48dff9261bd58396 (diff)
downloadlinux-0e05e192c0ff706ee2a12eb65074085e3967d862.tar.bz2
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
F: drivers/net/ethernet/neterion/
NETFILTER/IPTABLES/IPCHAINS
-P: Rusty Russell
-P: Marc Boucher
-P: James Morris
P: Harald Welte
P: Jozsef Kadlecsik
+M: Pablo Neira Ayuso <pablo@netfilter.org>
M: Patrick McHardy <kaber@trash.net>
L: netfilter-devel@vger.kernel.org
L: netfilter@vger.kernel.org