aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/addrconf.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-12-22 16:26:31 -0500
committerDavid S. Miller <davem@davemloft.net>2015-12-22 16:26:31 -0500
commit024f35c55233fb6041e2b31165271f5b941802e6 (patch)
tree10a167131329e876cb48ad8d4410b96c7d221265 /net/ipv6/addrconf.c
parentipv6/addrlabel: fix ip6addrlbl_get() (diff)
parentxfrm: dst_entries_init() per-net dst_ops (diff)
downloadlinux-dev-024f35c55233fb6041e2b31165271f5b941802e6.tar.xz
linux-dev-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/ipv6/addrconf.c')
0 files changed, 0 insertions, 0 deletions