Merge branches 'ipoib', 'mlx4' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Tue, 5 Feb 2013 17:45:25 +0000 (09:45 -0800)
committerRoland Dreier <roland@purestorage.com>
Tue, 5 Feb 2013 17:45:25 +0000 (09:45 -0800)

Trivial merge