leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12e09c694a
linux/drivers/net/ethernet/chelsio/cxgb4
History
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
..
clip_tbl.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-01-06 22:54:18 -05:00
clip_tbl.h
cxgb4_dcb.c cxgb4 : Fill in number of DCB traffic classes supported 2015-07-21 00:23:23 -07:00
cxgb4_dcb.h
cxgb4_debugfs.c cxgb4: Fixes static checker warning in mps_tcam_show() 2016-01-10 22:42:03 -05:00
cxgb4_debugfs.h VFS: Fix up some ->d_inode accesses in the chelsio driver 2015-04-15 15:06:54 -04:00
cxgb4_ethtool.c cxgb4: Pass correct argument to t4_link_l1cfg() 2015-12-23 22:34:44 -05:00
cxgb4_fcoe.c
cxgb4_fcoe.h
cxgb4_main.c cxgb4: Use __dev_uc_sync/__dev_mc_sync to sync MAC address 2016-02-18 14:16:12 -05:00
cxgb4_uld.h cxgb4: T6 adapter lld support for iw_cxgb4 driver 2015-10-21 23:16:38 -04:00
cxgb4.h cxgb4: Use __dev_uc_sync/__dev_mc_sync to sync MAC address 2016-02-18 14:16:12 -05:00
l2t.c cxgb4: Replace arpq_head/arpq_tail with SKB double link-list code 2015-12-17 15:51:05 -05:00
l2t.h cxgb4: Replace arpq_head/arpq_tail with SKB double link-list code 2015-12-17 15:51:05 -05:00
Makefile cxgb4: Move ethtool related code to a separate file 2015-04-07 17:38:54 -04:00
sge.c cxgb4: Update SGE context congestion map change for T6 adapter 2015-12-23 22:34:45 -05:00
t4_chip_type.h cxgb4: T6 adapter lld support for iw_cxgb4 driver 2015-10-21 23:16:38 -04:00
t4_hw.c cxgb4: Use __dev_uc_sync/__dev_mc_sync to sync MAC address 2016-02-18 14:16:12 -05:00
t4_hw.h cxgb4: Update pm_stats for T6 adapter family 2015-12-23 22:34:44 -05:00
t4_msg.h cxgb4/iw_cxgb4: TOS support 2016-02-11 07:13:23 -05:00
t4_pci_id_tbl.h cxgb4: Add pci device id for chelsio t540 lom adapter 2016-02-16 15:36:30 -05:00
t4_regs.h cxgb4: Update mps_tcam output to include T6 fields 2015-12-23 22:34:45 -05:00
t4_values.h cxgb4/cxgb4vf: Update Ingress padding boundary values for T6 adapter 2015-12-23 22:34:44 -05:00
t4fw_api.h cxgb4/iw_cxgb4: TOS support 2016-02-11 07:13:23 -05:00
t4fw_version.h cxgb4: changes for new firmware 1.14.4.0 2015-09-09 21:30:18 -07:00