]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Thu, 21 Jun 2018 15:12:39 +0000 (08:12 -0700)
committerDavid Ahern <dsahern@gmail.com>
Thu, 21 Jun 2018 15:12:39 +0000 (08:12 -0700)
Signed-off-by: David Ahern <dsahern@gmail.com>

Trivial merge