summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2011-03-15 18:58:04 +0100
committerRoland Dreier <roland@purestorage.com>2011-03-15 18:58:04 +0100
commit043332cf28368e38fdfcee1a4827025e8bdbc540 (patch)
treefb179157040c52ac2c8184f52e28de65342a6267 /drivers
parentRDMA/cma: Replace global lock in rdma_destroy_id() with id-specific one (diff)
parentRDMA/cxgb4: Debugfs dump_qp() updates (diff)
parentIB/ipath: Don't reset disabled devices (diff)
parentIB/qib: Fix M_Key field in SubnGet and SubnGetResp MADs (diff)
downloadlinux-043332cf28368e38fdfcee1a4827025e8bdbc540.tar.xz
linux-043332cf28368e38fdfcee1a4827025e8bdbc540.zip
Merge branches 'cma', 'cxgb4', 'ipath' and 'qib' into for-next