]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Sat, 24 Nov 2018 15:06:11 +0000 (07:06 -0800)
committerDavid Ahern <dsahern@gmail.com>
Sat, 24 Nov 2018 15:06:11 +0000 (07:06 -0800)
Signed-off-by: David Ahern <dsahern@gmail.com>
1  2 
rdma/rdma.h
rdma/utils.c

diff --cc rdma/rdma.h
Simple merge
diff --cc rdma/utils.c
Simple merge