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)
1  2 
drivers/infiniband/hw/hfi1/pio.c

Simple merge