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

Browse source

...

This commit is contained in:

Jeff Garzik 2006-01-31 11:50:11 -05:00

parent b0b020d478 ae7ec20582

commit 0febb720fe

4 changed files with 34 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/hostap/Kconfig

View file

49

drivers/net/wireless/ipw2100.c

View file

7

drivers/net/wireless/ipw2200.c

View file

4

net/ieee80211/ieee80211_rx.c

View file