summaryrefslogtreecommitdiffstats
path: root/include/rdma
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-06-23 12:29:26 -0400
committerDoug Ledford <dledford@redhat.com>2016-06-23 12:29:26 -0400
commitfb92d8fb1b9c2de7d7d50c199e6d3020544702e8 (patch)
tree869bf40aef4fc9fb540a11bcef6b70257ce32598 /include/rdma
parent33688abb2802ff3a230bd2441f765477b94cc89e (diff)
parentdd6b0241260d0f16c4051da1c5b09d4da8992ef2 (diff)
parent0ad17a8f7fa000cbfc51eedd7fddd20f7664e4b6 (diff)
parent939b6ca873e7bbef4b26a1cffacf1a1bf2f3f362 (diff)
downloadlinux-fb92d8fb1b9c2de7d7d50c199e6d3020544702e8.tar.bz2
Merge branches 'cxgb4-4.8', 'mlx5-4.8' and 'fw-version' into k.o/for-4.8