Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Mon, 30 Jul 2012 14:47:27 +0000 (07:47 -0700)
committerRoland Dreier <roland@purestorage.com>
Mon, 30 Jul 2012 14:47:27 +0000 (07:47 -0700)

Trivial merge