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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-drv.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_cmds.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40evf/i40e_txrx.c
Simple merge

diff --cc lib/rhashtable.c
Simple merge

diff --cc net/bridge/br_fdb.c
Simple merge

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