]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c62a64 458539a)
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Fri, 6 Apr 2018 16:02:02 +0000 (09:02 -0700)
committerDavid Ahern <dsahern@gmail.com>
Fri, 6 Apr 2018 16:02:02 +0000 (09:02 -0700)
Signed-off-by: David Ahern <dsahern@gmail.com>

Trivial merge
Upstream mirror of iproute2