]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Fri, 29 Sep 2017 17:51:25 +0000 (10:51 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Fri, 29 Sep 2017 17:51:25 +0000 (10:51 -0700)

Trivial merge