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
..
mlx4	mlx4: remove duplicate code in mlx4_en_process_rx_cq()	2017-03-09 09:54:46 -08:00
mlx5/core	net/mlx5e: Fix loopback selftest	2017-03-10 10:03:26 -08:00
mlxsw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-03-15 11:59:10 -07:00
Kconfig	mlxsw: Introduce Mellanox switch driver core	2015-07-30 00:04:59 -07:00
Makefile	mlxsw: Introduce Mellanox switch driver core	2015-07-30 00:04:59 -07:00