From: Roland Dreier <roland@purestorage.com>
Date: Thu, 17 Feb 2011 22:04:59 +0000 (-0800)
Subject: Merge branches 'nes' and 'qib' into for-next
X-Git-Tag: firefly_0821_release~7613^2~2418^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=814b0a61204d24f9fba6f7c575e6450d15ce2cf1;p=firefly-linux-kernel-4.4.55.git

Merge branches 'nes' and 'qib' into for-next
---

814b0a61204d24f9fba6f7c575e6450d15ce2cf1