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

..

cxio_dbg.c

cxgb3: Convert PDBG to pr_debug

2017-04-20 16:13:20 -04:00

cxio_hal.c

RDMA/cxgb3: remove redundant first assignement of sqp

2017-09-27 08:54:19 -04:00

cxio_hal.h

cxgb3: Convert PDBG to pr_debug

2017-04-20 16:13:20 -04:00

cxio_resource.c

cxgb3: Convert PDBG to pr_debug

2017-04-20 16:13:20 -04:00

cxio_resource.h

…

cxio_wr.h

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00

iwch_cm.c

Merge branch 'timer_setup' into for-next

2017-10-18 13:12:09 -04:00

iwch_cm.h

cxgb3: Convert PDBG to pr_debug

2017-04-20 16:13:20 -04:00

iwch_cq.c

cxgb3: Convert PDBG to pr_debug

2017-04-20 16:13:20 -04:00

iwch_ev.c

cxgb3: Convert PDBG to pr_debug

2017-04-20 16:13:20 -04:00

iwch_mem.c

cxgb3: Convert PDBG to pr_debug

2017-04-20 16:13:20 -04:00

iwch_provider.c

RDMA/cxgb3: Convert timers to use timer_setup()

2017-10-18 11:48:34 -04:00

iwch_provider.h

RDMA/cxgb3: Convert timers to use timer_setup()

2017-10-18 11:48:34 -04:00

iwch_qp.c

RDMA/cxgb3: Annotate locking assumptions

2017-10-14 20:47:05 -04:00

iwch.c

RDMA: Remove useless MODULE_VERSION

2017-07-24 08:45:11 -04:00

iwch.h

IB/cxgb3: convert to idr_alloc()

2013-02-27 19:10:16 -08:00

Kconfig

IB/{cxgb3,cxgb4}: Remove unneeded config dependencies

2017-09-27 08:54:19 -04:00

Makefile

chelsio: Move the Chelsio drivers

2011-08-10 19:54:52 -07:00

tcb.h

…