diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 07:02:04 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 07:02:04 +0200 |
| commit | b2382b363df828f25e35ed8b70a3da33b29b2a64 (patch) | |
| tree | 23aa2e70ba4650390c9281b3696172313bdb0f38 /net/ieee80211 | |
| parent | ieee80211: remove last uses of compat define WLAN_CAPABILITY_BSS (diff) | |
| parent | Linux v2.6.13-rc7 (diff) | |
| download | linux-b2382b363df828f25e35ed8b70a3da33b29b2a64.tar.xz linux-b2382b363df828f25e35ed8b70a3da33b29b2a64.zip | |
Merge upstream into ieee80211.
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
Diffstat (limited to 'net/ieee80211')
0 files changed, 0 insertions, 0 deletions