summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/ulp
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-05-05 22:42:09 +0200
committerDoug Ledford <dledford@redhat.com>2016-05-05 22:42:09 +0200
commit94d7f1a255db84233a2da70b27d9abf9c0a57135 (patch)
tree1caea28f70315117432636945607d1eb2b772df7 /drivers/infiniband/ulp
parentRDMA/i40iw: Fix for removing quad hash entries (diff)
parentIB/hfi1: Serialize hrtimer function calls (diff)
parentRDMA/iw_cxgb4: remove abort_connection() usage from ep_timeout() (diff)
downloadlinux-94d7f1a255db84233a2da70b27d9abf9c0a57135.tar.xz
linux-94d7f1a255db84233a2da70b27d9abf9c0a57135.zip
Merge branches 'hfi1' and 'iw_cxgb4' into k.o/for-4.7