]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Thu, 3 Aug 2017 23:11:22 +0000 (16:11 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Thu, 3 Aug 2017 23:11:22 +0000 (16:11 -0700)

Trivial merge