]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <shemming@brocade.com>
Fri, 18 Dec 2015 01:21:15 +0000 (17:21 -0800)
committerStephen Hemminger <shemming@brocade.com>
Fri, 18 Dec 2015 01:21:15 +0000 (17:21 -0800)
1  2 
include/utils.h

diff --cc include/utils.h
Simple merge