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-28 16:06:30 -05:00

parent 6651a5c383 4a99ac3a9e

commit b0b020d478

4 changed files with 31 additions and 11 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

4

drivers/net/wireless/orinoco_cs.c

View file

4

include/net/ieee80211.h

View file

22

net/ieee80211/ieee80211_rx.c

View file

12

net/ieee80211/ieee80211_wx.c

View file