Merge branches 'cxgb4' and 'mlx5' into k.o/for-4.8
authorDoug Ledford <dledford@redhat.com>
Thu, 4 Aug 2016 00:58:45 +0000 (20:58 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 4 Aug 2016 00:58:45 +0000 (20:58 -0400)
commit3e5e8e8a9a059c15881abd582edcaf4d2f736caf
treeac545a54cddafdacae7387885b62e342fe982906
parentfb92d8fb1b9c2de7d7d50c199e6d3020544702e8
parent59c68ac31e15ad09d2cb04734e3c8c544a95f8d4
parent321a9e3ebccb5e6b61bd4efbb98ae259c6b8609b
Merge branches 'cxgb4' and 'mlx5' into k.o/for-4.8
drivers/infiniband/hw/mlx5/main.c