Merge branches 'cxgb4', 'ipoib' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Sat, 23 Mar 2013 01:08:03 +0000 (18:08 -0700)
committerRoland Dreier <roland@purestorage.com>
Sat, 23 Mar 2013 01:08:03 +0000 (18:08 -0700)

Trivial merge