Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
authorJeff Garzik <jgarzik@pobox.com>
Wed, 13 Jul 2005 20:23:51 +0000 (16:23 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 13 Jul 2005 20:23:51 +0000 (16:23 -0400)

Trivial merge