Merge branch 'hfi1-2' into k.o/for-4.7
authorDoug Ledford <dledford@redhat.com>
Thu, 26 May 2016 16:50:05 +0000 (12:50 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 26 May 2016 16:50:05 +0000 (12:50 -0400)

Trivial merge