diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-25 03:00:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-25 03:00:05 +0200 |
| commit | 29be6180766eb2a3cb59a0d5a47eb90863cf9019 (patch) | |
| tree | 36457f9e29365f9762b06c621df89d0589011efa /drivers/net/ethernet/broadcom | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse... (diff) | |
| parent | ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack (diff) | |
| download | linux-29be6180766eb2a3cb59a0d5a47eb90863cf9019.tar.xz linux-29be6180766eb2a3cb59a0d5a47eb90863cf9019.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
0 files changed, 0 insertions, 0 deletions