David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-01-28 10:33:06 -05:00
..
bnxt_dcb.c	bnxt_en: Add PFC statistics.	2016-12-05 13:21:40 -05:00
bnxt_dcb.h	bnxt_en: Implement DCBNL to support host-based DCBX.	2016-12-05 13:21:40 -05:00
bnxt_ethtool.c	bnxt_en: Add support for ethtool -p.	2017-01-13 23:21:31 -05:00
bnxt_ethtool.h	bnxt_en: Add support for ethtool -p.	2017-01-13 23:21:31 -05: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 to firmware interface spec to 1.6.1.	2017-01-13 23:21:31 -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: Add the ulp_sriov_cfg hooks for bnxt_re RDMA driver.	2017-01-13 23:21: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_ulp.c	bnxt_en: Add interface to support RDMA driver.	2016-12-07 10:59:26 -05:00
bnxt_ulp.h	bnxt_en: Add interface to support RDMA driver.	2016-12-07 10:59:26 -05:00
bnxt.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
bnxt.h	bnxt_en: Add support for ethtool -p.	2017-01-13 23:21:31 -05:00
Makefile	bnxt_en: Add interface to support RDMA driver.	2016-12-07 10:59:26 -05:00