]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
projects / thirdparty / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd7f9c7 f8fc1d1)
Merge branch 'master' into net-next
authorStephen Hemminger <shemming@brocade.com>
Tue, 22 Dec 2015 05:37:21 +0000 (21:37 -0800)
committerStephen Hemminger <shemming@brocade.com>
Tue, 22 Dec 2015 05:37:21 +0000 (21:37 -0800)

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