summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2014-04-11 11:36:15 -0700
committerRoland Dreier <roland@purestorage.com>2014-04-11 11:36:15 -0700
commit5ae2866f5264fd51ac2ff6c95d02156a7c1f073c (patch)
tree72478c3e8e9d5b02110a6b17f5850000f7e88da5 /drivers/infiniband
parent1d1ca9b4fdde07325d263f7a75379527b1281f52 (diff)
parent9684c2ea6d1f5aab44119533530e4059b4c3e1ff (diff)
parentf360d88a2efddf2d2a2d01a8ac76fded34d624b4 (diff)
parentbf3f043e7bc2581475040348580f4acc786842e7 (diff)
downloadlinux-5ae2866f5264fd51ac2ff6c95d02156a7c1f073c.tar.bz2
Merge branches 'cxgb4', 'misc', 'mlx5' and 'qib' into for-next