]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Tue, 4 Apr 2017 21:56:41 +0000 (14:56 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 4 Apr 2017 21:56:41 +0000 (14:56 -0700)

Trivial merge