Merge branches 'cxgb4', 'ipoib', 'mlx4', 'ocrdma' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Fri, 14 Sep 2012 17:42:52 +0000 (10:42 -0700)
committerRoland Dreier <roland@purestorage.com>
Fri, 14 Sep 2012 17:42:52 +0000 (10:42 -0700)

Trivial merge