Merge branches 'cma', 'ipoib', 'misc', 'mlx4', 'ocrdma', 'qib' and 'srp' into for...
authorRoland Dreier <roland@purestorage.com>
Thu, 16 Aug 2012 16:38:39 +0000 (09:38 -0700)
committerRoland Dreier <roland@purestorage.com>
Thu, 16 Aug 2012 16:38:39 +0000 (09:38 -0700)

Trivial merge