summaryrefslogtreecommitdiff
path: root/include/rdma
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-03-14 17:42:57 -0400
committerDoug Ledford <dledford@redhat.com>2016-03-14 17:42:57 -0400
commit76b06402796c46566ea3794a999f718f144d93d2 (patch)
treea2ab576fce6c86fa8e37d751b9bb7edd930bb95c /include/rdma
parent5a30247bf09eeffaa46c00d59a62359aeb7d0462 (diff)
parent78a50a5e6068955494117b37b03379dacaf830b7 (diff)
parent387add460dc2f61567fa127bd76dab8ba6833234 (diff)
parent4c8ba94d1763e4c46564e59729cc0553ba1fddbb (diff)
parent7cf20fc62428367bbf853a8d968804a6ec6a4973 (diff)
Merge branches 'ib_core', 'ib_ipoib', 'srpt', 'drain-cq-v4' and 'net/9p' into k.o/for-4.6