Merge branch 'upstream-fixes' of git://git.tuxdriver.com/git/netdev-jwl
authorJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 18:57:44 +0000 (13:57 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 18:57:44 +0000 (13:57 -0500)

Trivial merge