]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'net-next'
authorStephen Hemminger <stephen@networkplumber.org>
Wed, 3 May 2017 16:28:10 +0000 (09:28 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Wed, 3 May 2017 16:28:10 +0000 (09:28 -0700)

Trivial merge