Merge branches 'chelsio', 'debug-cleanup', 'hns' and 'i40iw' into merge-test
authorDoug Ledford <dledford@redhat.com>
Wed, 14 Dec 2016 19:43:14 +0000 (14:43 -0500)
committerDoug Ledford <dledford@redhat.com>
Wed, 14 Dec 2016 19:43:14 +0000 (14:43 -0500)
commit884fa4f3048c4c43facfa6ba3b710169f7ee162c
treeb5fbaf9f7df14593cbc75b69b1efb489bafeb831
parent15f7e3c21b76598bc6e5816d2577ce843b2b963f
parentf73a1dbc45a58ea3ae5c3d60c71e58a8a9563914
parent4d4099584c2c4dca6c04d78ded4cc81f50cc3634
parentd6f7bbcc2e419c8afd4a426af78b3dac44632268
Merge branches 'chelsio', 'debug-cleanup', 'hns' and 'i40iw' into merge-test
drivers/infiniband/hw/cxgb4/device.c
drivers/infiniband/hw/i40iw/i40iw_cm.c
drivers/infiniband/hw/i40iw/i40iw_main.c
drivers/infiniband/hw/i40iw/i40iw_verbs.c