Merge branches 'cma', 'cxgb4' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Thu, 12 May 2011 15:57:20 +0000 (08:57 -0700)
committerRoland Dreier <roland@purestorage.com>
Thu, 12 May 2011 15:57:20 +0000 (08:57 -0700)

Trivial merge