Merge branches 'cma', 'cxgb4', 'ipath', 'misc', 'mlx4', 'mthca', 'qib' and 'srp'...
authorRoland Dreier <roland@purestorage.com>
Fri, 22 Jul 2011 18:56:11 +0000 (11:56 -0700)
committerRoland Dreier <roland@purestorage.com>
Fri, 22 Jul 2011 18:56:11 +0000 (11:56 -0700)

Trivial merge