git://git.onelab.eu / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7897c18 0ecd2e9)
reconcile onelab and planet-lab iproute2-2.6.38-0
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 13 Oct 2011 16:04:26 +0000 (18:04 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 13 Oct 2011 16:04:26 +0000 (18:04 +0200)

Trivial merge
iproute2