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)
commit8c32c4f2f7ff91152e09ce57a1bcb75596a71933
treec8d2b19f8153c343ac2a710c58cbaff269d94c6b
parent4931c6ef04b4eb6f726def76f845c10d1bb7057d
parentd4702645838c8e04893383b50406249382b4e6bf
Merge branch 'k.o/for-4.12-rc' into k.o/for-4.13-mlx-shared
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/qedr/qedr.h