summaryrefslogtreecommitdiff
path: root/drivers/staging/rdma
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-05-12 21:21:02 +0300
committerDoug Ledford <dledford@redhat.com>2016-05-12 21:21:02 +0300
commit321aebb880d2bfdf9cff503f57207e930aee6b1d (patch)
tree9819bff1d46f436c8d4c4b4f9609e8af4295014f /drivers/staging/rdma
parent80835cba4b857485b068e1ce83512e896e6f001e (diff)
parent3849e44d1c4b11c9e0f0f0343a0360b5e9594fb6 (diff)
downloadlinux-321aebb880d2bfdf9cff503f57207e930aee6b1d.tar.xz
Merge branches 'mlx5-1' and 'srp-1' into k.o/for-4.7
Diffstat (limited to 'drivers/staging/rdma')
0 files changed, 0 insertions, 0 deletions