From: Roland Dreier <roland@purestorage.com>
Date: Fri, 17 Jun 2011 18:57:55 +0000 (-0700)
Subject: Merge branches 'cxgb4' and 'qib' into for-next
X-Git-Tag: firefly_0821_release~3680^2~5206^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c7d74b090913102e7917dd02bb574ef060e1e930;p=firefly-linux-kernel-4.4.55.git

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

c7d74b090913102e7917dd02bb574ef060e1e930