git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce9f3f3 a2dc375)
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)
This merges (3f509c6 netfilter: nf_nat_sip: fix incorrect handling
of EBUSY for RTCP expectation) to Patrick McHardy's IPv6 NAT changes.


Trivial merge
Pandora Kernel Repository