]> rtime.felk.cvut.cz Git - lisovros/iproute2_canprio.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger...
authorStephen Hemminger <stephen.hemminger@vyatta.com>
Tue, 8 Apr 2008 14:58:50 +0000 (09:58 -0500)
committerStephen Hemminger <stephen.hemminger@vyatta.com>
Tue, 8 Apr 2008 14:58:50 +0000 (09:58 -0500)

Trivial merge