summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2013-05-06 12:22:57 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2013-05-06 12:28:15 +0200
commit42010ed0c669aeb1c5b015f5edf590c73919380c (patch)
treeb689700abdddf23f8813b88bdb447f6b36bd0ff4
parente778f56e2fdf2302626f40f01b3ffa33e4fd18a4 (diff)
netfilter: update MAINTAINERS file
* Remove reference to ipchains (not any longer in the tree) * Remove all P: (person) as this tag is obsolete according to the description. Therefore, update Jozsef Kadlecsik to M: so he can still show in the list of people. * Add URI to Netfilter's patchwork at ozlabs.org * Update URIs to Netfilter's git trees to point to kernel.org. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--MAINTAINERS10
1 files changed, 5 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e1f5fac1838..32aad62b3a6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5502,18 +5502,18 @@ F: Documentation/networking/s2io.txt
F: Documentation/networking/vxge.txt
F: drivers/net/ethernet/neterion/
-NETFILTER/IPTABLES/IPCHAINS
-P: Harald Welte
-P: Jozsef Kadlecsik
+NETFILTER/IPTABLES
M: Pablo Neira Ayuso <pablo@netfilter.org>
M: Patrick McHardy <kaber@trash.net>
+M: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
L: netfilter-devel@vger.kernel.org
L: netfilter@vger.kernel.org
L: coreteam@netfilter.org
W: http://www.netfilter.org/
W: http://www.iptables.org/
-T: git git://1984.lsi.us.es/nf
-T: git git://1984.lsi.us.es/nf-next
+Q: http://patchwork.ozlabs.org/project/netfilter-devel/list/
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
S: Supported
F: include/linux/netfilter*
F: include/linux/netfilter/