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-05-13 14:52:34 -04:00

parent 03e5da151b b538b8ce76

commit 209f6c3754

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

6

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

View file

2

drivers/net/wireless/iwlwifi/mvm/mvm.h

View file

2

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

View file

16

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

View file