summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2015-05-20 22:12:40 +0200
committerDoug Ledford <dledford@redhat.com>2015-05-20 22:12:40 +0200
commit175e8efe69974e240a89fb3a4bbeeb0b892de10d (patch)
tree05762cd97d6851c1c0094d239417c8ba6d300671 /net
parentIB/srp: Add 64-bit LUN support (diff)
parentRDS: Switch to generic logging helpers (diff)
parentIB/mad: Add const qualifiers to query only functions (diff)
parentIB/core: Change rdma_protocol_iboe to roce (diff)
downloadlinux-175e8efe69974e240a89fb3a4bbeeb0b892de10d.tar.xz
linux-175e8efe69974e240a89fb3a4bbeeb0b892de10d.zip
Merge branches 'bart-srp', 'generic-errors', 'ira-cleanups' and 'mwang-v8' into k.o/for-4.2