| commit | 29be6180766eb2a3cb59a0d5a47eb90863cf9019 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jul 24 18:00:05 2014 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jul 24 18:00:05 2014 -0700 |
| tree | 36457f9e29365f9762b06c621df89d0589011efa | |
| parent | 11f1fb3459d7b0b36c887dbd930e462f1e011d4d [diff] | |
| parent | 2627b7e15c5064ddd5e578e4efd948d48d531a3f [diff] |
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>