]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'main' into next
authorDavid Ahern <dsahern@gmail.com>
Mon, 12 Oct 2020 02:11:09 +0000 (20:11 -0600)
committerDavid Ahern <dsahern@gmail.com>
Mon, 12 Oct 2020 02:11:09 +0000 (20:11 -0600)
Signed-off-by: David Ahern <dsahern@gmail.com>
1  2 
ip/ipaddress.c
man/man8/ip-link.8.in

diff --cc ip/ipaddress.c
Simple merge
Simple merge