summaryrefslogtreecommitdiffstats
path: root/include/rdma
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2015-05-20 16:12:40 -0400
committerDoug Ledford <dledford@redhat.com>2015-05-20 16:12:40 -0400
commit175e8efe69974e240a89fb3a4bbeeb0b892de10d (patch)
tree05762cd97d6851c1c0094d239417c8ba6d300671 /include/rdma
parent985aa49556a576416d3f960f8fc1c6513863e33e (diff)
parent3c88f3dcff7bfd5059b704bdede2bfe972c0cec9 (diff)
parentf766c58fa3ea38a30912df8b5af3ca40637fe5e9 (diff)
parent5d9fb0440698a8b9e8595353d60cfac7ab30efae (diff)
downloadlinux-175e8efe69974e240a89fb3a4bbeeb0b892de10d.tar.bz2
Merge branches 'bart-srp', 'generic-errors', 'ira-cleanups' and 'mwang-v8' into k.o/for-4.2