From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 3 Sep 2012 13:28:30 +0000 (+0200)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=ace1fe1231bdfffd60b5e703aa5b7283fbf98dbd;p=linux-edison.git

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.
---

ace1fe1231bdfffd60b5e703aa5b7283fbf98dbd