Merge branch 'hfi1' into merge-test
authorDoug Ledford <dledford@redhat.com>
Wed, 14 Dec 2016 19:44:08 +0000 (14:44 -0500)
committerDoug Ledford <dledford@redhat.com>
Wed, 14 Dec 2016 19:44:08 +0000 (14:44 -0500)
commit253f8b22e0ad643edafd75e831e5c765732877f5
treec0e682e339f287a70606927863b9cc622c9952f1
parent884fa4f3048c4c43facfa6ba3b710169f7ee162c
parent22dccc5454a39427de7b87a080d026b6bf66a7b9
Merge branch 'hfi1' into merge-test
drivers/infiniband/hw/hfi1/pio.c