From: David S. Miller <davem@davemloft.net>
Date: Fri, 25 Jul 2014 01:00:05 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=29be6180766eb2a3cb59a0d5a47eb90863cf9019;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Via Simon Horman, I received the following one-liner for your net tree:

1) Fix crash when exiting from netns that uses IPVS and conntrack,
   from Julian Anastasov via Simon Horman.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

29be6180766eb2a3cb59a0d5a47eb90863cf9019