linux/drivers/net/ethernet/broadcom/bnx2x
David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/amd/xgbe/xgbe-desc.c
	drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-12-10 15:48:20 -05:00
..
bnx2x_cmn.c ethernet/broadcom: Use napi_alloc_skb instead of netdev_alloc_skb_ip_align 2014-12-10 13:31:58 -05:00
bnx2x_cmn.h bnx2x: New multi-function mode: UFP 2014-09-19 16:31:08 -04:00
bnx2x_dcb.c bnx2x: Code cleanup 2014-08-22 12:31:15 -07:00
bnx2x_dcb.h bnx2x: update MAINTAINERS for bnx2x and e-mail addresses 2014-05-30 17:04:26 -07:00
bnx2x_dump.h bnx2x: ethtool -d might cause timeout in log 2014-08-25 17:30:21 -07:00
bnx2x_ethtool.c ethtool: Support for configurable RSS hash function 2014-12-08 21:07:10 -05:00
bnx2x_fw_defs.h bnx2x: Utilize FW 7.10.51 2014-08-22 12:31:15 -07:00
bnx2x_fw_file_hdr.h bnx2x: update MAINTAINERS for bnx2x and e-mail addresses 2014-05-30 17:04:26 -07:00
bnx2x_hsi.h bnx2x: Add a fallback multi-function mode NPAR1.5 2014-09-19 16:31:08 -04:00
bnx2x_init_ops.h bnx2x: update MAINTAINERS for bnx2x and e-mail addresses 2014-05-30 17:04:26 -07:00
bnx2x_init.h bnx2x: update MAINTAINERS for bnx2x and e-mail addresses 2014-05-30 17:04:26 -07:00
bnx2x_link.c bnx2x: Limit 1G link enforcement 2014-12-09 13:26:07 -05:00
bnx2x_link.h bnx2x: Fix link problems for 1G SFP RJ45 module 2014-09-05 17:28:37 -07:00
bnx2x_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-12-10 15:48:20 -05:00
bnx2x_mfw_req.h bnx2x: Introduce 2013 and advance version to 1.78.02 2013-01-15 15:07:59 -05:00
bnx2x_reg.h bnx2x: Add timestamping and PTP hardware clock support 2014-08-22 12:31:15 -07:00
bnx2x_sp.c bnx2x: Use correct fastpath version for VFs. 2014-12-09 14:29:10 -05:00
bnx2x_sp.h bnx2x: Use correct fastpath version for VFs. 2014-12-09 14:29:10 -05:00
bnx2x_sriov.c bnx2x: Use correct fastpath version for VFs. 2014-12-09 14:29:10 -05:00
bnx2x_sriov.h bnx2x: Use correct fastpath version for VFs. 2014-12-09 14:29:10 -05:00
bnx2x_stats.c bnx2x: VF clean statistics 2014-08-25 17:30:22 -07:00
bnx2x_stats.h bnx2x: update MAINTAINERS for bnx2x and e-mail addresses 2014-05-30 17:04:26 -07:00
bnx2x_vfpf.c bnx2x: Use correct fastpath version for VFs. 2014-12-09 14:29:10 -05:00
bnx2x_vfpf.h bnx2x: Use correct fastpath version for VFs. 2014-12-09 14:29:10 -05:00
bnx2x.h bnx2x: Add a fallback multi-function mode NPAR1.5 2014-09-19 16:31:08 -04:00
Makefile bnx2x: Segregate SR-IOV code 2013-01-07 19:49:14 -08:00