summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-11-29 12:16:43 -0800
committerRoland Dreier <roland@purestorage.com>2012-11-29 12:16:43 -0800
commit78c90247afb786b1a1fbfffbcd42907ce480e36f (patch)
tree62d7c002f0ca8a7b8208451dcb99390bd31eeb0d /drivers/infiniband
parentd0951d2133f260e216dbaa8dadcc73d3d5237809 (diff)
parent63f05be2c075022d1b3227037f82ad75c4d5ab1d (diff)
parent311f813a2daefcba03f706a692fe0c67888d7622 (diff)
Merge branches 'cma' and 'mlx4' into for-next