---

yaml --- r: 273507 b: refs/heads/master c: 0e05e19 h: refs/heads/master i: 273505: a63b9f8 273503: 53deb99 v: v3
git-mirror · Nov 1, 2011 · 120681c · 120681c
1 parent 2bb3658
commit 120681c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2dad81adf2c49aa9f8bb7e7c48dff9261bd58396
+refs/heads/master: 0e05e192c0ff706ee2a12eb65074085e3967d862
diff --git a/trunk/MAINTAINERS b/trunk/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