Merge branch 'hfi1' into k.o/for-next
authorDoug Ledford <[email protected]>
Fri, 29 Sep 2017 15:12:54 +0000 (11:12 -0400)
committerDoug Ledford <[email protected]>
Fri, 29 Sep 2017 15:12:54 +0000 (11:12 -0400)
Signed-off-by: Doug Ledford <[email protected]>

Trivial merge