Merge branch 'k.o/for-4.12-rc' into k.o/for-4.13-mlx-shared
authorDoug Ledford <dledford@redhat.com>
Tue, 27 Jun 2017 20:55:59 +0000 (16:55 -0400)
committerDoug Ledford <dledford@redhat.com>
Tue, 27 Jun 2017 20:55:59 +0000 (16:55 -0400)
1  2 
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/qedr/qedr.h

Simple merge
Simple merge