]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19ecc16 f0b34d2)
Merge in fix for loss of MQ
authorStephen Hemminger <stephen.hemminger@vyatta.com>
Thu, 18 Sep 2008 04:51:40 +0000 (21:51 -0700)
committerStephen Hemminger <stephen.hemminger@vyatta.com>
Thu, 18 Sep 2008 04:51:40 +0000 (21:51 -0700)
Fix up conflict with earlier attempt at resolving build
issues with MQ


Trivial merge
Upstream mirror of iproute2