]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45f78b4 5551ed4)
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Wed, 12 Apr 2017 17:02:07 +0000 (10:02 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Wed, 12 Apr 2017 17:02:07 +0000 (10:02 -0700)

Trivial merge
Upstream mirror of iproute2