From: Roland Dreier <roland@purestorage.com>
Date: Mon, 19 Dec 2011 17:19:49 +0000 (-0800)
Subject: Merge branches 'cma', 'mlx4' and 'qib' into for-next
X-Git-Tag: v3.2-rc7~39^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=480390c8f393b3c770b7b71faa094c733bd0ae09;p=users%2Fhch%2Fmisc.git

Merge branches 'cma', 'mlx4' and 'qib' into for-next
---

480390c8f393b3c770b7b71faa094c733bd0ae09