diff options
author | Doug Ledford <dledford@redhat.com> | 2015-05-20 22:12:40 +0200 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2015-05-20 22:12:40 +0200 |
commit | 175e8efe69974e240a89fb3a4bbeeb0b892de10d (patch) | |
tree | 05762cd97d6851c1c0094d239417c8ba6d300671 /net | |
parent | IB/srp: Add 64-bit LUN support (diff) | |
parent | RDS: Switch to generic logging helpers (diff) | |
parent | IB/mad: Add const qualifiers to query only functions (diff) | |
parent | IB/core: Change rdma_protocol_iboe to roce (diff) | |
download | linux-175e8efe69974e240a89fb3a4bbeeb0b892de10d.tar.xz linux-175e8efe69974e240a89fb3a4bbeeb0b892de10d.zip |
Merge branches 'bart-srp', 'generic-errors', 'ira-cleanups' and 'mwang-v8' into k.o/for-4.2