diff options
author | David S. Miller <davem@davemloft.net> | 2015-12-22 16:26:31 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-12-22 16:26:31 -0500 |
commit | 024f35c55233fb6041e2b31165271f5b941802e6 (patch) | |
tree | 10a167131329e876cb48ad8d4410b96c7d221265 /net/rds/cong.c | |
parent | e459dfeeb64008b2d23bdf600f03b3605dbb8152 (diff) | |
parent | a8a572a6b5f2a79280d6e302cb3c1cb1fbaeb3e8 (diff) | |
download | linux-024f35c55233fb6041e2b31165271f5b941802e6.tar.gz linux-024f35c55233fb6041e2b31165271f5b941802e6.tar.bz2 linux-024f35c55233fb6041e2b31165271f5b941802e6.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2015-12-22
Just one patch to fix dst_entries_init with multiple namespaces.
From Dan Streetman.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/cong.c')
0 files changed, 0 insertions, 0 deletions