linux/drivers/net/ethernet/mellanox
David S. Miller 55b42b5ca2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/phy/marvell.c

Simple overlapping changes in drivers/net/phy/marvell.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-01 14:53:27 -04:00
..
mlx4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-11-01 14:53:27 -04:00
mlx5/core net/mlx5_core: Call synchronize_irq() before freeing EQ buffer 2014-10-26 22:46:03 -04:00
Kconfig mlx5: Add driver for Mellanox Connect-IB adapters 2013-07-08 10:32:24 -07:00
Makefile mlx5: Add driver for Mellanox Connect-IB adapters 2013-07-08 10:32:24 -07:00