]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commita1139697adac394ce1fb06410b914f070b314f64
tree34beeb4d2030ac0c6accadedadde2b8b6fb23002
parentaccbef5cc624be745c1de903dd3a05681aaa0ac1
parent050da902adde8faf6b1bef15ac4876ae145358f4
Merge branch 'mellanox' into k.o/for-next

Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/core/device.c
drivers/infiniband/ulp/ipoib/ipoib_main.c