linux/drivers/net/ethernet/broadcom/bnx2x
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
bnx2x_cmn.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
bnx2x_cmn.h bnx2x: VF RSS support - VF side 2013-09-05 12:44:31 -04:00
bnx2x_dcb.c bnx2x: Consider DCBX remote error 2013-08-20 00:21:47 -07:00
bnx2x_dcb.h bnx2x: Change DCB context handling 2013-08-20 00:21:47 -07:00
bnx2x_dump.h bnx2x: Revise comments and alignment 2013-06-02 21:36:47 -07:00
bnx2x_ethtool.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
bnx2x_fw_defs.h bnx2x, bnx2fc: Use per port max exchange resources 2013-04-25 04:06:46 -04:00
bnx2x_fw_file_hdr.h bnx2x: Introduce 2013 and advance version to 1.78.02 2013-01-15 15:07:59 -05:00
bnx2x_hsi.h bnx2x: Add support for EXTPHY2 LED mode 2013-09-28 15:24:03 -07:00
bnx2x_init_ops.h bnx2x: Remove many sparse warnings 2013-01-23 13:58:29 -05:00
bnx2x_init.h bnx2x: Don't pretend during register dump 2013-10-21 18:31:36 -04:00
bnx2x_link.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-01 17:06:14 -04:00
bnx2x_link.h bnx2x: Support reading I2C EEPROM SFF8472 2013-03-27 12:48:32 -04:00
bnx2x_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04: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: VF RSS support - PF side 2013-09-05 12:44:31 -04:00
bnx2x_sp.c bnx2x: VF RSS support - PF side 2013-09-05 12:44:31 -04:00
bnx2x_sp.h bnx2x: VF RSS support - PF side 2013-09-05 12:44:31 -04:00
bnx2x_sriov.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
bnx2x_sriov.h bnx2x: Don't disable/enable SR-IOV when loading 2013-09-28 15:24:01 -07:00
bnx2x_stats.c bnx2x: Lock DMAE when used by statistic flow 2013-10-21 18:31:35 -04:00
bnx2x_stats.h bnx2x: Fix VF stats sync 2013-08-27 22:03:04 -04:00
bnx2x_vfpf.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
bnx2x_vfpf.h bnx2x: Add ndo_get_phys_port_id support 2013-10-09 14:55:13 -04:00
bnx2x.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
Makefile bnx2x: Segregate SR-IOV code 2013-01-07 19:49:14 -08:00