summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/core
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2015-04-15 16:24:49 -0400
committerDoug Ledford <dledford@redhat.com>2015-04-15 16:24:49 -0400
commitc1c2fef6cfb04cf30a56bb37cff40d3498d7edbf (patch)
tree2476709d0bd4c9c8de71a849d5d5396078be3c5a /drivers/infiniband/core
parent66578b0b2f69659f00b6169e6fe7377c4b100d18 (diff)
parentca9b590caa17bcbbea119594992666e96cde9c2f (diff)
parentba943fb237ea48b01e3229f10cdb2a4274978a2d (diff)
parent59d2d18cc4e9ba30b370db18d0e02d792699da96 (diff)
parent56c1d2335b355205d6fabb7663d383e73ea0de47 (diff)
parent9f5d32af09b9a36ca1476c9932aac675051670c8 (diff)
downloadlinux-c1c2fef6cfb04cf30a56bb37cff40d3498d7edbf.tar.bz2
Merge branches 'cve-fixup', 'ipoib', 'iser', 'misc-4.1', 'or-mlx4' and 'srp' into for-4.1