| commit | b2382b363df828f25e35ed8b70a3da33b29b2a64 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jgarzik@pobox.com> | Wed Aug 24 01:02:04 2005 -0400 |
| committer | Jeff Garzik <jgarzik@pobox.com> | Wed Aug 24 01:02:04 2005 -0400 |
| tree | 23aa2e70ba4650390c9281b3696172313bdb0f38 | |
| parent | 1b5cca3a88b7682d538d129c25f0e3092613a243 [diff] | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf [diff] |
Merge upstream into ieee80211. Hand-fix merge conflict in drivers/usb/net/zd1201.c.