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
..
liquidio	net: cavium: liquidio: fix check for in progress flag	2016-02-13 06:05:41 -05:00
thunder	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
Kconfig	net: cavium: change NET_VENDOR_CAVIUM to bool	2015-10-21 19:12:16 -07:00
Makefile	Add support of Cavium Liquidio ethernet adapters	2015-06-10 22:44:08 -07:00