From: Roland Dreier <roland@purestorage.com>
Date: Wed, 5 Jun 2013 00:06:46 +0000 (-0700)
Subject: Merge branches 'iser' and 'qib' into for-next
X-Git-Tag: firefly_0821_release~3680^2~349^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c9a2433a901250637e05539ef111b91dbc52edb8;p=firefly-linux-kernel-4.4.55.git

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

c9a2433a901250637e05539ef111b91dbc52edb8