Merge upstream into ieee80211.
authorJeff Garzik <jgarzik@pobox.com>
Wed, 24 Aug 2005 05:02:04 +0000 (01:02 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 24 Aug 2005 05:02:04 +0000 (01:02 -0400)
commitb2382b363df828f25e35ed8b70a3da33b29b2a64
tree23aa2e70ba4650390c9281b3696172313bdb0f38
parent1b5cca3a88b7682d538d129c25f0e3092613a243
parent0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf
Merge upstream into ieee80211.

Hand-fix merge conflict in drivers/usb/net/zd1201.c.
drivers/net/wireless/Kconfig
drivers/usb/net/zd1201.c