Merge branches 'mlx5', 'qib' and 'srp' into for-next
authorRoland Dreier <roland@purestorage.com>
Thu, 11 Jul 2013 23:49:30 +0000 (16:49 -0700)
committerRoland Dreier <roland@purestorage.com>
Thu, 11 Jul 2013 23:49:30 +0000 (16:49 -0700)

Trivial merge