linux_dsm_epyc7002/drivers/net/ethernet/mellanox
David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-03-03 21:16:48 -05:00
..
mlx4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-03-03 21:16:48 -05:00
mlx5/core net/mlx5_core: Fix configuration of log_uar_page_sz 2015-02-11 19:42:23 -08: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