]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'net-next'
authorStephen Hemminger <shemming@brocade.com>
Wed, 24 Dec 2014 20:23:00 +0000 (12:23 -0800)
committerStephen Hemminger <shemming@brocade.com>
Wed, 24 Dec 2014 20:23:00 +0000 (12:23 -0800)
1  2 
ip/iplink.c

diff --cc ip/iplink.c
Simple merge