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
..
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-01-25 11:17:34 -08:00
hw	mlx4: Activate RoCE/SRIOV	2014-03-12 15:57:16 -04:00
ulp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2014-03-09 13:50:14 -07:00
Kconfig	Merge branch 'ip-roce' into for-next	2014-01-22 23:24:21 -08:00
Makefile	IB/usnic: Add Cisco VIC low-level hardware driver	2014-01-14 00:44:28 -08:00