tree 36457f9e29365f9762b06c621df89d0589011efa
parent 11f1fb3459d7b0b36c887dbd930e462f1e011d4d
parent 2627b7e15c5064ddd5e578e4efd948d48d531a3f
author David S. Miller <davem@davemloft.net> 1406250005 -0700
committer David S. Miller <davem@davemloft.net> 1406250005 -0700

Merge git://git.kernel.org/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>