David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... udplite conflict is resolved by taking what 'net-next' did which removed the backlog receive method assignment, since it is no longer necessary. Two entries were added to the non-priv ethtool operations switch statement, one in 'net' and one in 'net-next, so simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-11-26 23:42:21 -05:00
..
bnxt_ethtool.c	bnxt_en: Add ethtool -n|-N rx-flow-hash support.	2016-11-16 23:11:07 -05:00
bnxt_ethtool.h	bnxt_en: Add EEE setup code.	2016-04-05 16:20:46 -04:00
bnxt_fw_hdr.h	bnxt_en: Added support for Secure Firmware Update	2016-09-19 21:32:24 -04:00
bnxt_hsi.h	bnxt_en: Update firmware interface spec to 1.5.4.	2016-11-16 23:11:07 -05:00
bnxt_nvm_defs.h	bnxt_en: Add support for updating flash more securely	2016-07-02 14:52:35 -04:00
bnxt_sriov.c	bnxt_en: Fix VF virtual link state.	2016-11-13 12:37:31 -05:00
bnxt_sriov.h	net: Update API for VF vlan protocol 802.1ad support	2016-09-24 08:01:26 -04:00
bnxt.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-26 23:42:21 -05:00
bnxt.h	bnxt_en: Add UDP RSS support for 57X1X chips.	2016-11-16 23:11:07 -05:00
Makefile