]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Sun, 19 Feb 2017 00:07:32 +0000 (16:07 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Sun, 19 Feb 2017 00:07:32 +0000 (16:07 -0800)

Trivial merge