linux/drivers/net/ethernet/mellanox
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
mlx4 net/mlx4_core: Load higher level modules according to ports type 2013-10-17 15:10:50 -04:00
mlx5/core IB/mlx5: Fix eq names to display nicely in /proc/interrupts 2013-10-10 09:23:59 -07: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