Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD

Browse source

...

This commit is contained in:

Emmanuel Grumbach 2014-05-13 13:51:53 +03:00

parent 41f6fc10d3 1c4abec0ba

commit 90c456fc79

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

9

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

View file

3

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

View file

19

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

View file

10

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

View file