Merge branches 'cxgb3', 'ipoib', 'misc' and 'nes' into for-next
authorRoland Dreier <rolandd@cisco.com>
Fri, 12 Mar 2010 18:54:20 +0000 (10:54 -0800)
committerRoland Dreier <rolandd@cisco.com>
Fri, 12 Mar 2010 18:54:20 +0000 (10:54 -0800)

Trivial merge