diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-10 14:34:18 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-10 14:34:18 -0400 |
| commit | d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c (patch) | |
| tree | 8ce9d1f42907ff6b9455b155ca47ebae143f9a1b /drivers/infiniband/hw/mlx4/alias_GUID.c | |
| parent | 320438301b85038e995b5a40a24c43cbc0ed4909 (diff) | |
| parent | db14dff1743e4cd3d840950ad8d735b8957aaf6a (diff) | |
| download | linux-d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c.tar.gz linux-d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c.tar.bz2 linux-d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c.zip | |
Merge branch 'rdma-netlink' into k.o/merge-test
Conflicts:
include/rdma/ib_verbs.h - Modified a function signature adjacent
to a newly added function signature from a previous merge
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/mlx4/alias_GUID.c')
0 files changed, 0 insertions, 0 deletions