]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Wed, 9 Aug 2017 15:41:34 +0000 (08:41 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Wed, 9 Aug 2017 15:41:34 +0000 (08:41 -0700)

Trivial merge