summaryrefslogtreecommitdiff
path: root/drivers/infiniband/hw
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2011-12-19 09:19:49 -0800
committerRoland Dreier <roland@purestorage.com>2011-12-19 09:19:49 -0800
commit480390c8f393b3c770b7b71faa094c733bd0ae09 (patch)
tree7b9c01f77c06475bd61d25b1f7a3520029ccf34b /drivers/infiniband/hw
parent04ded1672402577cd3f390c764f3046cc704a42a (diff)
parent4af3ce0de0c12e5c17811eaefad36ab8e146c0fd (diff)
parent29d1b16145e78e0f4af54751965c4a09e83bd872 (diff)
Merge branches 'cma', 'mlx4' and 'qib' into for-next