Merge remote-tracking branch 'net-next/master'

diff --cc crypto/ablkcipher.c
Simple merge

diff --cc crypto/aead.c
Simple merge

diff --cc crypto/crypto_user.c
Simple merge

diff --cc drivers/net/ethernet/marvell/sky2.c
Simple merge

diff --cc net/core/filter.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

diff --cc net/decnet/dn_dev.c
Simple merge

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

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

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

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

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

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

diff --cc net/netfilter/nf_conntrack_core.c
Simple merge

diff --cc net/openvswitch/datapath.c
Simple merge