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)
commit94d7f1a255db84233a2da70b27d9abf9c0a57135
tree1caea28f70315117432636945607d1eb2b772df7
parentccea5f0f01797a0c0b6cba8176ecda3b10ca8534
parentd35cf74492c5ba0d8e1c08755c78be4ef3af650e
parent6973627968acbdf7d6f45a4c4813d46bf8e2a66a
Merge branches 'hfi1' and 'iw_cxgb4' into k.o/for-4.7