From: Doug Ledford <dledford@redhat.com>
Date: Thu, 5 May 2016 20:42:09 +0000 (-0400)
Subject: Merge branches 'hfi1' and 'iw_cxgb4' into k.o/for-4.7
X-Git-Tag: v6.1~16448^2~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=94d7f1a255db84233a2da70b27d9abf9c0a57135;p=sdk%2Femulator%2Femulator-kernel.git

Merge branches 'hfi1' and 'iw_cxgb4' into k.o/for-4.7
---

94d7f1a255db84233a2da70b27d9abf9c0a57135