]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Tue, 1 Aug 2017 00:05:09 +0000 (17:05 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 1 Aug 2017 00:05:09 +0000 (17:05 -0700)

Trivial merge