]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d03d6f b876b7e)
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Mon, 3 Dec 2018 23:39:29 +0000 (15:39 -0800)
committerDavid Ahern <dsahern@gmail.com>
Mon, 3 Dec 2018 23:39:29 +0000 (15:39 -0800)
Signed-off-by: David Ahern <dsahern@gmail.com>
1  2 
man/man8/ip-route.8.in patch | diff1 | diff2 | blob | history
man/man8/rdma-dev.8 patch | diff1 | diff2 | blob | history

diff --cc man/man8/ip-route.8.in
Simple merge
diff --cc man/man8/rdma-dev.8
Simple merge
Upstream mirror of iproute2