]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Mon, 12 Dec 2016 23:24:40 +0000 (15:24 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 12 Dec 2016 23:24:40 +0000 (15:24 -0800)

Trivial merge