Skip to content
Commit ace1fe12 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 

This merges (3f509c68 netfilter: nf_nat_sip: fix incorrect handling
of EBUSY for RTCP expectation) to Patrick McHardy's IPv6 NAT changes.
parents ce9f3f31 a2dc375e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment