Merge branches 'hfi1' and 'iw_cxgb4' into k.o/for-4.7
authorDoug Ledford <dledford@redhat.com>
Thu, 5 May 2016 20:42:09 +0000 (16:42 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 5 May 2016 20:42:09 +0000 (16:42 -0400)

Trivial merge