Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/tg3.c
Simple merge

diff --cc drivers/net/phy/mscc.c
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc include/net/sctp/sctp.h
Simple merge

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

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

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

diff --cc net/sctp/socket.c
Simple merge

diff --cc net/smc/af_smc.c
Simple merge

diff --cc net/smc/smc_core.c
Simple merge

diff --cc net/smc/smc_core.h
Simple merge