]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11f1fb3 2627b7e)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Fri, 25 Jul 2014 01:00:05 +0000 (18:00 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 25 Jul 2014 01:00:05 +0000 (18:00 -0700)
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>

Trivial merge
Ubuntu combined Linux kernel mirror