diff options
author | Doug Ledford <dledford@redhat.com> | 2017-09-27 17:58:06 +0300 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-09-27 17:58:06 +0300 |
commit | 1848757c3d8bff3addf881c8bcc2b85e25ccf25e (patch) | |
tree | abdf5496aa63c4cf7da88e7a6ed7fa9ebbca7d97 /drivers/infiniband/hw/qedr | |
parent | 7ae6f2a3d552dc01c4423c0cdede1daa9fd07991 (diff) | |
parent | 400d324a14acbe9a6189d0336fdb22f69c2cfd9a (diff) | |
parent | 4d45b7573ba74a278652b0566d779c2aa7ea3df1 (diff) | |
download | linux-1848757c3d8bff3addf881c8bcc2b85e25ccf25e.tar.xz |
Merge branches 'hns' and 'misc' into k.o/for-next
Signed-off-by: Doug Ledford <dledford@redhat.com>