David S. Miller 101c431492 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/genet/bcmgenet.c net/core/sock.c Conflicts were overlapping changes in bcmgenet and the lockdep handling of sockets. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-03-15 11:59:10 -07:00
..
liquidio	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-03-15 11:59:10 -07:00
octeon	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
thunder	net: thunderx: Allow IPv6 frames with zero UDP checksum	2017-03-09 13:12:41 -08:00
Kconfig	LiquidIO VF: s/select/imply/ for PTP_1588_CLOCK	2017-01-04 13:27:16 -05:00
Makefile	netdev: Move octeon/octeon_mgmt driver to cavium directory.	2016-03-18 18:25:30 -04:00