]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
projects / thirdparty / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8593b2c 385caeb)
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Tue, 9 Feb 2016 18:52:26 +0000 (10:52 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 9 Feb 2016 18:52:26 +0000 (10:52 -0800)

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