Merge branches 'iser', 'mthca' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Fri, 4 Nov 2011 16:36:04 +0000 (09:36 -0700)
committerRoland Dreier <roland@purestorage.com>
Fri, 4 Nov 2011 16:36:04 +0000 (09:36 -0700)

Trivial merge