]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <shemming@brocade.com>
Sun, 23 Aug 2015 17:09:46 +0000 (10:09 -0700)
committerStephen Hemminger <shemming@brocade.com>
Sun, 23 Aug 2015 17:09:46 +0000 (10:09 -0700)
1  2 
ip/iplink.c
man/man8/ip-link.8.in

diff --cc ip/iplink.c
Simple merge
Simple merge