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)
1  2  3  4 
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

Simple merge