]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Tue, 20 Sep 2016 16:50:53 +0000 (09:50 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 20 Sep 2016 16:50:53 +0000 (09:50 -0700)

Trivial merge