Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 9 Jun 2015 03:06:56 +0000 (20:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Jun 2015 03:06:56 +0000 (20:06 -0700)
13 files changed:
1  2 
MAINTAINERS
drivers/net/ethernet/amd/xgbe/xgbe-drv.c
drivers/net/ethernet/emulex/benet/be_cmds.c
drivers/net/ethernet/emulex/benet/be_ethtool.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/intel/i40e/i40e.h
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/i40e/i40e_txrx.c
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
drivers/net/ethernet/intel/i40evf/i40e_txrx.c
lib/rhashtable.c
net/bridge/br_fdb.c
net/core/dev.c

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