diff options
author | Doug Ledford <dledford@redhat.com> | 2017-08-18 21:12:04 +0300 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-08-18 21:12:04 +0300 |
commit | b0e32e20e3c63778d8c20a40d8bec8b18baffecb (patch) | |
tree | 2e0c3311c53889473b94d49132fe5b7cdee71d51 /drivers/infiniband/hw/hfi1/mad.c | |
parent | d3cf4d9915c4fb60aeef580973aa77420e600746 (diff) | |
parent | 870201f95fcbd19538aef630393fe9d583eff82e (diff) | |
download | linux-b0e32e20e3c63778d8c20a40d8bec8b18baffecb.tar.xz |
Merge branch 'k.o/for-4.13-rc' into k.o/for-next
Merging our (hopefully) final -rc pull branch into our for-next branch
because some of our pending patches won't apply cleanly without having
the -rc patches in our tree.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/hfi1/mad.c')
0 files changed, 0 insertions, 0 deletions