]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
projects / thirdparty / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5ae170 aeeaae2)
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Fri, 13 Jan 2017 01:44:44 +0000 (17:44 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Fri, 13 Jan 2017 01:44:44 +0000 (17:44 -0800)

Trivial merge
Mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git