]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Thu, 12 Oct 2017 16:06:10 +0000 (09:06 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Thu, 12 Oct 2017 16:06:10 +0000 (09:06 -0700)

Trivial merge