Merge branches 'cxgb4' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Fri, 17 Jun 2011 18:57:55 +0000 (11:57 -0700)
committerRoland Dreier <roland@purestorage.com>
Fri, 17 Jun 2011 18:57:55 +0000 (11:57 -0700)

Trivial merge