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

Browse source

...

This commit is contained in:

David S. Miller 2007-10-17 21:14:35 -07:00

parent c95477090a 107acb23ba

commit fe537c0ee8

5 changed files with 77 additions and 48 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/ssb/Kconfig

View file

3

drivers/ssb/driver_mipscore.c

View file

2

net/ieee80211/ieee80211_crypt_tkip.c

View file

45

net/mac80211/ieee80211_ioctl.c

View file

71

net/mac80211/ieee80211_sta.c

View file