diff options
author | Doug Ledford <dledford@redhat.com> | 2015-12-15 19:10:44 (GMT) |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2015-12-15 19:10:44 (GMT) |
commit | c6333f9f9f7646e311248a09e8ed96126a97aba8 (patch) | |
tree | 1a86124c5b43fa858f1d8d7beb99bcd29d6d6ab7 /lib/string.c | |
parent | 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff) | |
parent | cfeb91b375ad5f52665e00d374a4e403d2e6063e (diff) | |
download | linux-c6333f9f9f7646e311248a09e8ed96126a97aba8.tar.xz |
Merge branch 'rdma-cq.2' of git://git.infradead.org/users/hch/rdma into 4.5/rdma-cq
Signed-off-by: Doug Ledford <dledford@redhat.com>
Conflicts:
drivers/infiniband/ulp/srp/ib_srp.c - Conflicts with changes in
ib_srp.c introduced during 4.4-rc updates
Diffstat (limited to 'lib/string.c')
0 files changed, 0 insertions, 0 deletions