David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx5/core/en.h drivers/net/ethernet/mellanox/mlx5/core/en_main.c drivers/net/usb/r8152.c All three conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-07-06 10:35:22 -07:00
..
mlx4	net/mlx4: Fix some indent inconsistancy	2016-07-04 15:22:33 -07:00
mlx5/core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
mlxsw	mlxsw: Add the unresolved next-hops probes	2016-07-05 09:06:31 -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