]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2dc309 7b3d366)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger...
authorStephen Hemminger <stephen.hemminger@vyatta.com>
Mon, 28 Apr 2008 22:57:19 +0000 (15:57 -0700)
committerStephen Hemminger <stephen.hemminger@vyatta.com>
Mon, 28 Apr 2008 22:57:19 +0000 (15:57 -0700)

Trivial merge
Upstream mirror of iproute2