summaryrefslogtreecommitdiff
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2013-07-11 16:49:30 -0700
committerRoland Dreier <roland@purestorage.com>2013-07-11 16:49:30 -0700
commite04abfa2436e3ab016b23eb1afb2c5578b8dc2cf (patch)
tree8230008b7e9a520699de1f593cc399f2211a7bd3 /drivers/infiniband
parent0eba55114838059b873b173f1115cd5c5bab3dfd (diff)
parent5e631a03af7eaa55b9ef7fa7611144c2c698c6c6 (diff)
parent0b3ddf380ca7aa6a009cc3e1944933fff8113b6a (diff)
parent80d5e8a235624cd3c0e24be7c070fd6f445e590d (diff)
Merge branches 'mlx5', 'qib' and 'srp' into for-next