diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-05 12:44:25 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-05 12:44:25 +0200 |
commit | c90a9bb9073a4096596360f02ea711c619663494 (patch) | |
tree | dc85d9f4c0d423e6b523e81c41a5b68e267de14f /MAINTAINERS | |
parent | drivers/ieee802154/at231rf230: remove unused return status (diff) | |
parent | Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux (diff) | |
download | linux-c90a9bb9073a4096596360f02ea711c619663494.tar.xz linux-c90a9bb9073a4096596360f02ea711c619663494.zip |
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 L: coreteam@netfilter.org W: http://www.netfilter.org/ W: http://www.iptables.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git -T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git +T: git git://1984.lsi.us.es/nf +T: git git://1984.lsi.us.es/nf-next S: Supported F: include/linux/netfilter* F: include/linux/netfilter/ |