]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Tue, 27 Jun 2017 23:10:55 +0000 (16:10 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 27 Jun 2017 23:10:55 +0000 (16:10 -0700)
1  2 
man/man8/ip-route.8.in

Simple merge