David S. Miller 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/r8152.c drivers/net/xen-netback/netback.c Both the r8152 and netback conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-14 22:31:55 -04:00
..
mlx4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
mlx5/core	IB/mlx5_core: remove unreachable function call in module init	2014-03-10 15:23:22 -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