]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bfbccea 093f18f)
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 patch | diff1 | diff2 | blob | history

diff --cc ip/iplink.c
Simple merge
Upstream mirror of iproute2