Merge branch 'mellanox' into k.o/for-next
authorDoug Ledford <dledford@redhat.com>
Fri, 25 Aug 2017 00:25:15 +0000 (20:25 -0400)
committerDoug Ledford <dledford@redhat.com>
Fri, 25 Aug 2017 00:25:15 +0000 (20:25 -0400)
Signed-off-by: Doug Ledford <dledford@redhat.com>
1  2 
drivers/infiniband/core/device.c
drivers/infiniband/ulp/ipoib/ipoib_main.c

Simple merge