Merge branch 'master' 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-22 12:49:22 -04:00

parent 7fc9427222 4601879419

commit 0eeb315b20

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

15

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

View file

7

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

View file