]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Thu, 1 Sep 2016 15:39:15 +0000 (08:39 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Thu, 1 Sep 2016 15:39:15 +0000 (08:39 -0700)

Trivial merge