Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorStephen Hemminger <shemminger@osdl.org>
Mon, 8 May 2006 23:01:20 +0000 (16:01 -0700)
committerStephen Hemminger <shemminger@osdl.org>
Mon, 8 May 2006 23:01:20 +0000 (16:01 -0700)

Trivial merge