summaryrefslogtreecommitdiff
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-01-30 16:18:21 -0800
committerRoland Dreier <roland@purestorage.com>2012-01-30 16:18:21 -0800
commitf36ae342388e09361cfa43c38fd65b89687cf5db (patch)
tree5c86fca419e311f2e7d3d4c7059878782f7baaa7 /drivers/infiniband
parent9ced69ca5296567033804950d8d2161f454c5012 (diff)
parentef5352875a12a0a45be8bca29fc218a94786d920 (diff)
parente47e321a35c741ee41b67976f8c6a3a7a42bc5c0 (diff)
parenta6f7feae6d19e84253918d88b04153af09d3a243 (diff)
parentc5488c571f08b2e21b060a1b43aa840d0a3c6e7a (diff)
parentb6bfefb0410dc49853bccd9673ead896d317c082 (diff)
Merge branches 'cma', 'ipath', 'misc', 'mlx4', 'nes' and 'qib' into for-next