projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4931c6e d470264)
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 patch | diff1 | diff2 | blob | history
drivers/infiniband/hw/qedr/qedr.h patch | diff1 | diff2 | blob | history

diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge
diff --cc drivers/infiniband/hw/qedr/qedr.h
Simple merge
Domain: System / Kernel;