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>

diff --cc net/ipv4/xfrm4_policy.c
Simple merge

diff --cc net/ipv6/xfrm6_policy.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge