diff options
| author | Doug Ledford <dledford@redhat.com> | 2015-12-22 23:03:15 +0100 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-12-22 23:03:15 +0100 |
| commit | 882f3b3b916a01c703bf7516800a0dca741cd3e7 (patch) | |
| tree | 3a67f04a2b31985bb8044d39f0f5ebd9858658ae /drivers/scsi/atari_scsi.c | |
| parent | IB/core: Remove ib_query_device (diff) | |
| parent | Merge branch 'rdma-cq.2' of git://git.infradead.org/users/hch/rdma into 4.5/r... (diff) | |
| download | linux-882f3b3b916a01c703bf7516800a0dca741cd3e7.tar.xz linux-882f3b3b916a01c703bf7516800a0dca741cd3e7.zip | |
Merge branches '4.5/Or-cleanup' and '4.5/rdma-cq' into k.o/for-4.5
Signed-off-by: Doug Ledford <dledford@redhat.com>
Conflicts:
drivers/infiniband/ulp/iser/iser_verbs.c
Diffstat (limited to 'drivers/scsi/atari_scsi.c')
0 files changed, 0 insertions, 0 deletions