tree 06c7492a8f3cc65f916768616ca24c6bc7171761
parent ce9f3f31efb88841e4df98794b13dbac8c4901da
parent a2dc375e12334b3d8f787a48b2fb6172ccfb80ae
author Pablo Neira Ayuso <pablo@netfilter.org> 1346678910 +0200
committer Pablo Neira Ayuso <pablo@netfilter.org> 1346679291 +0200

Merge git://git.kernel.org/pub/scm/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.