]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
projects / thirdparty / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc223ab f9dec65)
Merge branch 'net-next'
authorStephen Hemminger <stephen@networkplumber.org>
Mon, 18 Jan 2016 17:37:45 +0000 (09:37 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 18 Jan 2016 17:37:45 +0000 (09:37 -0800)
1  2 
ip/iplink.c patch | diff1 | diff2 | blob | history

diff --cc ip/iplink.c
Simple merge
Mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git