diff options
author | Doug Ledford <dledford@redhat.com> | 2017-04-20 18:00:41 +0200 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-04-20 18:00:41 +0200 |
commit | 23790ba2d775698ed44ef37b8c72b94c73ae5a6c (patch) | |
tree | 90ad0754a5ffd73d28105d56b44fe038700d81ed /drivers/rapidio/rio.c | |
parent | Merge branch 'mlx5-RDMA-netdevice' (diff) | |
parent | IB/core: Rename uverbs event file structure (diff) | |
download | linux-23790ba2d775698ed44ef37b8c72b94c73ae5a6c.tar.xz linux-23790ba2d775698ed44ef37b8c72b94c73ae5a6c.zip |
Merge branch 'k.o/for-4.12' into k.o/for-4.12-rdma-netdevice
Diffstat (limited to 'drivers/rapidio/rio.c')
0 files changed, 0 insertions, 0 deletions