David S. Miller 29fda25a2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two minor conflicts in virtio_net driver (bug fix overlapping addition of a helper) and MAINTAINERS (new driver edit overlapping revamp of PHY entry). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-01 10:07:50 -07:00
..
mlx4	mlx4_en: remove unnecessary error check	2017-07-24 17:26:32 -07:00
mlx5/core	net/mlx5: Fix mlx5_add_flow_rules call with correct num of dests	2017-07-27 16:40:17 +03: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-08-01 10:07:50 -07: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