Merge branches 'cma', 'mlx4' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Mon, 19 Dec 2011 17:19:49 +0000 (09:19 -0800)
committerRoland Dreier <roland@purestorage.com>
Mon, 19 Dec 2011 17:19:49 +0000 (09:19 -0800)

Trivial merge