Merge branches 'cxgb4', 'ipoib' and 'qib' into for-next
authorRoland Dreier <rolandd@cisco.com>
Thu, 8 Jul 2010 16:10:24 +0000 (09:10 -0700)
committerRoland Dreier <rolandd@cisco.com>
Thu, 8 Jul 2010 16:10:24 +0000 (09:10 -0700)

Trivial merge