Roland Dreier fb1b5034e4 Merge branch 'ip-roce' into for-next ... Conflicts: drivers/infiniband/hw/mlx4/main.c		2014-01-22 23:24:21 -08:00
..
core	Merge branch 'ip-roce' into for-next	2014-01-22 23:24:21 -08:00
hw	Merge branch 'ip-roce' into for-next	2014-01-22 23:24:21 -08:00
ulp	Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next	2014-01-22 23:24:13 -08: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