summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2017-09-27 10:58:06 -0400
committerDoug Ledford <dledford@redhat.com>2017-09-27 10:58:06 -0400
commit1848757c3d8bff3addf881c8bcc2b85e25ccf25e (patch)
treeabdf5496aa63c4cf7da88e7a6ed7fa9ebbca7d97 /drivers/infiniband
parent7ae6f2a3d552dc01c4423c0cdede1daa9fd07991 (diff)
parent400d324a14acbe9a6189d0336fdb22f69c2cfd9a (diff)
parent4d45b7573ba74a278652b0566d779c2aa7ea3df1 (diff)
downloadlinux-1848757c3d8bff3addf881c8bcc2b85e25ccf25e.tar.bz2
Merge branches 'hns' and 'misc' into k.o/for-next
Signed-off-by: Doug Ledford <dledford@redhat.com>