Commits
![Kalle Valo](https://secure.gravatar.com/avatar/c854a2df55cc6ad5e959f7146f956470.jpg?s=96&d=mm)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git This is to fix some conflicts in iwlwifi. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c drivers/net/wireless/intel/iwlwifi/mvm/scan.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git This is to fix some conflicts in iwlwifi. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c drivers/net/wireless/intel/iwlwifi/mvm/scan.c