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
..
2016-03-10 20:37:33 -05:00
2017-01-24 12:23:35 -05:00
2017-01-24 16:20:37 -05:00
2017-01-24 16:20:37 -05:00
2017-01-12 11:38:41 -05:00
2017-10-18 13:12:09 -04:00