]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c061b75 50b8a84)
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Mon, 29 Jan 2018 16:24:57 +0000 (08:24 -0800)
committerDavid Ahern <dsahern@gmail.com>
Mon, 29 Jan 2018 16:24:57 +0000 (08:24 -0800)
Signed-off-by: David Ahern <dsahern@gmail.com>
1  2 
ip/ipaddress.c patch | diff1 | diff2 | blob | history

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