diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-05 06:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-05 06:44:25 -0400 |
| commit | c90a9bb9073a4096596360f02ea711c619663494 (patch) | |
| tree | dc85d9f4c0d423e6b523e81c41a5b68e267de14f /MAINTAINERS | |
| parent | 23c342153ef2a4ad8bd4f2d6515126449658d2b3 (diff) | |
| parent | 9e85a6f9dc231f3ed3c1dc1b12217505d970142a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d350dae2ce1c..8da1373bd6d1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4655,8 +4655,8 @@ L: netfilter@vger.kernel.org | |||
| 4655 | L: coreteam@netfilter.org | 4655 | L: coreteam@netfilter.org |
| 4656 | W: http://www.netfilter.org/ | 4656 | W: http://www.netfilter.org/ |
| 4657 | W: http://www.iptables.org/ | 4657 | W: http://www.iptables.org/ |
| 4658 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git | 4658 | T: git git://1984.lsi.us.es/nf |
| 4659 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git | 4659 | T: git git://1984.lsi.us.es/nf-next |
| 4660 | S: Supported | 4660 | S: Supported |
| 4661 | F: include/linux/netfilter* | 4661 | F: include/linux/netfilter* |
| 4662 | F: include/linux/netfilter/ | 4662 | F: include/linux/netfilter/ |