Merge git://git.tuxdriver.com/git/netdev-jwl
authorJeff Garzik <jgarzik@pobox.com>
Tue, 8 Nov 2005 03:54:48 +0000 (22:54 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 8 Nov 2005 03:54:48 +0000 (22:54 -0500)

Trivial merge