]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a463fd4 a9c49b8)
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Fri, 7 Dec 2018 21:02:08 +0000 (13:02 -0800)
committerDavid Ahern <dsahern@gmail.com>
Fri, 7 Dec 2018 21:02:08 +0000 (13:02 -0800)
Signed-off-by: David Ahern <dsahern@gmail.com>

Trivial merge
Upstream mirror of iproute2