David S. Miller 3a3f7d130e Merge https://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Some overlapping changes in the mlx5 driver. A merge conflict resolution posted by Stephen Rothwell was used as a guide. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-07-03 03:42:10 -07:00
..
mlx4	mlx4_en: make mlx4_log_num_mgm_entry_size static	2017-07-03 02:41:26 -07:00
mlx5/core	Merge https://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-07-03 03:42:10 -07:00
mlxfw	net/mlxfw: Properly handle dependancy with non-loadable mlx5	2017-07-03 02:32:25 -07:00
mlxsw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-30 12:43:08 -04:00
Kconfig	Add the mlxfw module for Mellanox firmware flash process	2017-05-25 17:46:17 -04:00
Makefile	Add the mlxfw module for Mellanox firmware flash process	2017-05-25 17:46:17 -04:00