Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/wireless-2.6
authorJeff Garzik <jgarzik@pobox.com>
Tue, 17 Jan 2006 12:22:26 +0000 (07:22 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 17 Jan 2006 12:22:26 +0000 (07:22 -0500)

Trivial merge