]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Fri, 14 Apr 2017 22:59:12 +0000 (15:59 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Fri, 14 Apr 2017 22:59:12 +0000 (15:59 -0700)

Trivial merge