diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-29 16:35:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-29 16:35:53 -0700 |
| commit | 0c12d91b7064e16e96939243187b12fbd99caac7 (patch) | |
| tree | 53fdcb3dda55a4089289856439a654c66839f8f6 /MAINTAINERS | |
| parent | 76fbc247b9aebc30f6d2c8ec1f69edcb68eaa328 (diff) | |
| parent | 4009e18851ea555959c6017d848983b3d60bf667 (diff) | |
| download | linux-0c12d91b7064e16e96939243187b12fbd99caac7.tar.gz linux-0c12d91b7064e16e96939243187b12fbd99caac7.tar.bz2 linux-0c12d91b7064e16e96939243187b12fbd99caac7.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso says:
====================
The following are 4 fixes and the update of the MAINTAINERS file
to point to my Netfilter trees.
They are:
* One refcount leak fix in IPVS IPv6 support from Eric Dumazet.
* One fix for interface comparison in ipset hash-netiface sets
from Florian Westphal.
* One fix for a missing rcu_read_unlock in nfnetlink from
Tomasz Bursztyka.
* One fix for a kernel crash if IPSET_CMD_NONE is set to ipset via
nfnetlink, again from Tomasz Bursztyka.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index eb22272b2116..03df1d15ebf3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4654,8 +4654,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/ |