]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
projects / thirdparty / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c518d3a 1473bda)
Merge branch 'master' into net-next
authorStephen Hemminger <shemming@brocade.com>
Fri, 23 Oct 2015 22:46:08 +0000 (15:46 -0700)
committerStephen Hemminger <shemming@brocade.com>
Fri, 23 Oct 2015 22:46:08 +0000 (15:46 -0700)
1  2 
ip/iproute.c patch | diff1 | diff2 | blob | history

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