David S. Miller 51e18a453f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflict was two parallel additions of include files to sch_generic.c, no biggie. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-09 22:09:55 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-09 22:09:55 -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