aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2013-02-05 09:45:25 -0800
committerRoland Dreier <roland@purestorage.com>2013-02-05 09:45:25 -0800
commitcbdba97a0f576cc2d958048ffedbe88948b67e03 (patch)
tree94fd2285cbfd2d433b88955db21bf8f2aabd661a
parent7e5a90c25f89128c096dbdb0e5451962438b1e05 (diff)
parentf97b4b5d46d586782b40c8ced81bf9763c18e7cc (diff)
parentd359f35430c4ea4dd4e24d809aeaeff1fa54c314 (diff)
Merge branches 'ipoib', 'mlx4' and 'qib' into for-next