David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-30 00:54:02 -04:00
..
liquidio	liquidio: declare liquidio_set_rxcsum_command static	2016-08-23 16:53:55 -07:00
octeon	ethernet: cavium: octeon: add missing of_node_put after calling of_parse_phandle	2016-08-01 21:43:48 -07:00
thunder	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-30 00:54:02 -04:00
Kconfig	net: thunderx: Add RGMII interface type support	2016-08-13 11:59:31 -07:00
Makefile	netdev: Move octeon/octeon_mgmt driver to cavium directory.	2016-03-18 18:25:30 -04:00