]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25c567b 26a49de)
Merge branch 'master' into next
authorDavid Ahern <dsahern@gmail.com>
Wed, 10 Jul 2019 21:41:13 +0000 (14:41 -0700)
committerDavid Ahern <dsahern@gmail.com>
Wed, 10 Jul 2019 21:41:13 +0000 (14:41 -0700)
Signed-off-by: David Ahern <dsahern@gmail.com>
1  2 
ip/iproute.c patch | diff1 | diff2 | blob | history

diff --cc ip/iproute.c
Simple merge
Upstream mirror of iproute2