]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Sun, 23 Apr 2017 16:14:35 +0000 (09:14 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Sun, 23 Apr 2017 16:14:35 +0000 (09:14 -0700)

Trivial merge