From: Roland Dreier <roland@purestorage.com>
Date: Wed, 4 Jan 2012 17:18:20 +0000 (-0800)
Subject: Merge branches 'cma', 'misc', 'mlx4', 'nes', 'qib' and 'uverbs' into for-next
X-Git-Tag: firefly_0821_release~3680^2~3812^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1583676d9e3f97371eaa726c4e061f9b23f43c44;p=firefly-linux-kernel-4.4.55.git

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

1583676d9e3f97371eaa726c4e061f9b23f43c44