]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Wed, 31 May 2017 00:40:57 +0000 (17:40 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Wed, 31 May 2017 00:40:57 +0000 (17:40 -0700)

Trivial merge