-
git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-nextDavid S. Miller authored
Minor conflict in ip_output.c, overlapping changes to the body of an if() statement. Signed-off-by:David S. Miller <davem@davemloft.net>
62515f95
Minor conflict in ip_output.c, overlapping changes to
the body of an if() statement.
Signed-off-by: David S. Miller <davem@davemloft.net>