Doug Ledford 894b82c427 Merge branch 'timer_setup' into for-next ... Conflicts: drivers/infiniband/hw/cxgb4/cm.c drivers/infiniband/hw/qib/qib_driver.c drivers/infiniband/hw/qib/qib_mad.c There were minor fixups needed in these files. Just minor context diffs due to patches from independent sources touching the same basic area. Signed-off-by: Doug Ledford <dledford@redhat.com>		2017-10-18 13:12:09 -04:00
..
rdmavt	Merge branch 'timer_setup' into for-next	2017-10-18 13:12:09 -04:00
rxe	RDMA/rxe: Suppress gcc 7 fall-through complaints	2017-10-14 20:47:07 -04:00
Makefile	Soft RoCE driver	2016-08-04 11:13:12 -04:00