From: Roland Dreier <roland@purestorage.com>
Date: Thu, 29 Nov 2012 20:16:43 +0000 (-0800)
Subject: Merge branches 'cma' and 'mlx4' into for-next
X-Git-Tag: firefly_0821_release~3680^2~1458^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=78c90247afb786b1a1fbfffbcd42907ce480e36f;p=firefly-linux-kernel-4.4.55.git

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

78c90247afb786b1a1fbfffbcd42907ce480e36f