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-07-07 14:59:57 -04:00

parent 701a9e6193 dc271ee0d0

commit 1b2388d03f

3 changed files with 8 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

12

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

View file

5

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

View file

12

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

View file