Merge branches 'cma' and 'mlx4' into for-next
authorRoland Dreier <roland@purestorage.com>
Thu, 29 Nov 2012 20:16:43 +0000 (12:16 -0800)
committerRoland Dreier <roland@purestorage.com>
Thu, 29 Nov 2012 20:16:43 +0000 (12:16 -0800)

Trivial merge