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

Browse source

...

This commit is contained in:

John W. Linville 2014-06-25 14:20:22 -04:00

parent 12307e4208 a42c9fcc4a

commit dc70a292da

4 changed files with 29 additions and 47 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

1

drivers/net/wireless/iwlwifi/iwl-fw.h

View file

7

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

View file

63

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

View file

3

drivers/net/wireless/iwlwifi/pcie/drv.c

View file