David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
bnxt_ethtool.c	bnxt_en: Remove 20G support and advertise only 40GbaseCR4.	2016-02-16 15:50:02 -05:00
bnxt_ethtool.h
bnxt_fw_hdr.h
bnxt_hsi.h	bnxt_en: Update to Firmware interface spec 1.0.0.	2015-12-28 00:57:29 -05:00
bnxt_nvm_defs.h
bnxt_sriov.c	bnxt_en: Update to Firmware interface spec 1.0.0.	2015-12-28 00:57:29 -05:00
bnxt_sriov.h
bnxt.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
bnxt.h	bnxt_en: Reduce default ring sizes.	2016-02-16 15:50:02 -05:00
Makefile