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

Trivial merge