summaryrefslogtreecommitdiff
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2014-10-14 14:09:12 -0700
committerRoland Dreier <roland@purestorage.com>2014-10-14 14:09:12 -0700
commit7b909bb49ac204bfd2e628707db37beb490dbc5c (patch)
tree0484423a8147b2fa15564213403b882a610fe9bd /drivers/infiniband
parenta040f95dc81986d7d55bd98a9455217522ef706d (diff)
parentda22b896b119001b0cd9eb9ecb5b3fd85e948e43 (diff)
parent78eda2bb6542057b214af3bc1cae09c63e65d1d1 (diff)
parentf39f86971c0cded8c2563e7dfd82c650ca9c0044 (diff)
parent05df78059b3b991036666de9ee124d5cbd9e375d (diff)
Merge branches 'core', 'cxgb4', 'iser', 'mlx5' and 'ocrdma' into for-next