Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Browse source

...

This commit is contained in:

John W. Linville 2012-06-22 14:40:38 -04:00

parent 133189a46c e75dac921d

commit 9ffddb1a93

3 changed files with 24 additions and 21 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/iwlwifi/dvm/agn.h

View file

37

drivers/net/wireless/iwlwifi/dvm/mac80211.c

View file

6

drivers/net/wireless/iwlwifi/dvm/scan.c

View file