David S. Miller 29fda25a2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two minor conflicts in virtio_net driver (bug fix overlapping addition of a helper) and MAINTAINERS (new driver edit overlapping revamp of PHY entry). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-01 10:07:50 -07:00
..
liquidio	liquidio: bump up driver version to match newer NIC firmware	2017-07-29 15:21:18 -07:00
octeon	net: ethernet: update drivers to handle HWTSTAMP_FILTER_NTP_ALL	2017-05-21 13:37:32 -04:00
thunder	net: thunderx: Fix BGX transmit stall due to underflow	2017-07-29 14:17:07 -07:00
Kconfig	LiquidIO VF: s/select/imply/ for PTP_1588_CLOCK	2017-01-04 13:27:16 -05:00
Makefile