Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'qib' into for-next
authorRoland Dreier <rolandd@cisco.com>
Tue, 25 May 2010 16:54:03 +0000 (09:54 -0700)
committerRoland Dreier <rolandd@cisco.com>
Tue, 25 May 2010 16:54:03 +0000 (09:54 -0700)

Trivial merge