David S. Miller 7cda4cee13 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Small overlapping change conflict ('net' changed a line, 'net-next' added a line right afterwards) in flexcan.c Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-05 10:44:19 -05:00
..
liquidio	liquidio: fix incorrect indentation of assignment statement	2017-12-03 09:59:38 -05:00
octeon	ethernet: cavium: octeon: Switch to using netdev_info().	2017-10-26 10:03:35 +09:00
thunder	net: thunderx: Set max queue count taking XDP_TX into account	2017-11-30 09:24:07 -05:00
Kconfig	liquidio: Configure switchdev with devlink	2017-11-01 11:39:52 +09:00
Makefile	netdev: Move octeon/octeon_mgmt driver to cavium directory.	2016-03-18 18:25:30 -04:00