forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/drivers/net/ethernet/cavium/thunder
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
..
Makefile
nic.h net: thunderx: Assign affinity hints to vf's interrupts 2016-02-11 11:30:26 -05:00
nic_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-12-17 22:08:28 -05:00
nic_reg.h net: thunderx: Incorporate pass2 silicon CPI index configuration changes 2015-10-25 18:13:02 -07:00
nicvf_ethtool.c net, thunderx: Add TX timeout and RX buffer alloc failure stats. 2016-02-11 11:30:26 -05:00
nicvf_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-02-23 00:09:14 -05:00
nicvf_queues.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-02-23 00:09:14 -05:00
nicvf_queues.h net: thunderx: Fix receive packet stats 2016-02-17 22:24:57 -05:00
q_struct.h net: thunderx: HW TSO support for pass-2 hardware 2015-12-11 23:38:17 -05:00
thunder_bgx.c net: thunderx: bgx: Add log message when setting mac address 2016-02-11 11:30:26 -05:00
thunder_bgx.h net: thunderx: Enable BGX LMAC's RX/TX only after VF is up 2015-12-02 15:58:50 -05:00