From: Doug Ledford <dledford@redhat.com>
Date: Wed, 14 Dec 2016 19:44:08 +0000 (-0500)
Subject: Merge branch 'hfi1' into merge-test
X-Git-Tag: v4.10-rc1~97^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=253f8b22e0ad643edafd75e831e5c765732877f5;p=thirdparty%2Flinux.git

Merge branch 'hfi1' into merge-test
---

253f8b22e0ad643edafd75e831e5c765732877f5