summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2015-02-20 09:04:40 -0800
committerRoland Dreier <roland@purestorage.com>2015-02-20 09:04:40 -0800
commit147d1da951cf067badb7d3585002e1eb46719f83 (patch)
treea615ad9c7bd95a7d697bd71038d5c3d6555e7083 /drivers
parent0fb8bcf022f19a375d7c4bd79ac513da8ae6d78b (diff)
parent1fc8190dd66e280cfba8944506fe883a3ed86e57 (diff)
parent9a3119e4b787d8c855202eb0388b213f86f88714 (diff)
parent98e8be869386eb01439d4ee95c821aa00bdf7f2a (diff)
parentf614fc15ae39ceb531586e3969f2b99fd23182a0 (diff)
parent59a39ca3f70ad2b4a5d3ee3161e112ec774a4146 (diff)
parent1707cb4ab723cc07c5f6b83e21e142fa196c9e72 (diff)
parentda12c1f6857c07bccdb7e96fde938d6840a77f4f (diff)
parent3453bddbebebb6d6b89659b777f04959f60175a2 (diff)
Merge branches 'core', 'cxgb4', 'iser', 'mlx4', 'mlx5', 'ocrdma', 'odp', 'qib' and 'srp' into for-next