Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes

Browse source

...

This commit is contained in:

Jeff Garzik 2006-11-30 06:01:04 -05:00

parent f2b67c7945 a88556a4b2

commit c1cb0b77f9

7 changed files with 26 additions and 28 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/net/wireless/zd1211rw/zd_ieee80211.h

View file

2

drivers/net/wireless/zd1211rw/zd_mac.c

View file

4

drivers/net/wireless/zd1211rw/zd_mac.h

View file

26

drivers/net/wireless/zd1211rw/zd_usb.c

View file

14

drivers/net/wireless/zd1211rw/zd_usb.h

View file

4

net/ieee80211/ieee80211_tx.c

View file

2

net/ieee80211/softmac/ieee80211softmac_scan.c

View file