]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b2f2d7 8f2550a)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger...
authorStephen Hemminger <stephen.hemminger@vyatta.com>
Fri, 7 Dec 2012 17:04:38 +0000 (09:04 -0800)
committerStephen Hemminger <stephen.hemminger@vyatta.com>
Fri, 7 Dec 2012 17:04:38 +0000 (09:04 -0800)

Trivial merge
Upstream mirror of iproute2