projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit29be6180766eb2a3cb59a0d5a47eb90863cf9019
tree36457f9e29365f9762b06c621df89d0589011efatree | snapshot
parent11f1fb3459d7b0b36c887dbd930e462f1e011d4dcommit | diff
parent2627b7e15c5064ddd5e578e4efd948d48d531a3fcommit | diff
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>
John Crispins staging tree