Merge tag 'mac80211-next-for-davem-2015-08-14' mac80211-next.git

iwlwifi needs new mac80211 patches so merge mac80211-next.git to
wireless-drivers-next.git.

diff --cc drivers/net/wireless/iwlwifi/dvm/dev.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/dvm/rx.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mvm.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/ops.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/rx.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/sta.c
Simple merge