Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 3 Sep 2012 13:28:30 +0000 (15:28 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 3 Sep 2012 13:34:51 +0000 (15:34 +0200)
commitace1fe1231bdfffd60b5e703aa5b7283fbf98dbd
tree06c7492a8f3cc65f916768616ca24c6bc7171761
parentce9f3f31efb88841e4df98794b13dbac8c4901da
parenta2dc375e12334b3d8f787a48b2fb6172ccfb80ae
Merge git://git./linux/kernel/git/davem/net-next

This merges (3f509c6 netfilter: nf_nat_sip: fix incorrect handling
of EBUSY for RTCP expectation) to Patrick McHardy's IPv6 NAT changes.
include/net/netns/ipv4.h
net/ipv6/addrconf.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_nat_sip.c