Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

diff --cc drivers/net/slip.c
Simple merge

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

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

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

diff --cc net/netlabel/netlabel_domainhash.c
Simple merge

diff --cc net/netlabel/netlabel_unlabeled.c
Simple merge

diff --cc net/socket.c
Simple merge