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)
commit8779e7658df2496f27660586e3a20a86c75fb526
tree831a1ebc8e399ee231fe23cf1eecc3fc4a70948a
parente6f61130ed7a124138c4f7b1bd35e24e8113cb83
parentf158486527ebfb4c1fe4dcb69b12479090d66b72
Merge branch 'hfi1-2' into k.o/for-4.7