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

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

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
Simple merge

diff --cc drivers/net/hyperv/netvsc.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/cfg80211.c
Simple merge