From: Roland Dreier <roland@purestorage.com>
Date: Tue, 31 Jan 2012 00:18:21 +0000 (-0800)
Subject: Merge branches 'cma', 'ipath', 'misc', 'mlx4', 'nes' and 'qib' into for-next
X-Git-Tag: v3.3-rc3~40^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f36ae342388e09361cfa43c38fd65b89687cf5db;p=users%2Fjedix%2Flinux-maple.git

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

f36ae342388e09361cfa43c38fd65b89687cf5db