]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Wed, 5 Jul 2017 16:12:16 +0000 (09:12 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Wed, 5 Jul 2017 16:12:16 +0000 (09:12 -0700)

Trivial merge