Merge tag 'mac80211-next-for-davem-2015-08-14' mac80211-next.git
authorKalle Valo <kvalo@codeaurora.org>
Tue, 18 Aug 2015 05:44:22 +0000 (08:44 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 18 Aug 2015 05:44:22 +0000 (08:44 +0300)
iwlwifi needs new mac80211 patches so merge mac80211-next.git to
wireless-drivers-next.git.

1  2 
drivers/net/wireless/iwlwifi/dvm/dev.h
drivers/net/wireless/iwlwifi/dvm/rx.c
drivers/net/wireless/iwlwifi/mvm/mvm.h
drivers/net/wireless/iwlwifi/mvm/ops.c
drivers/net/wireless/iwlwifi/mvm/rx.c
drivers/net/wireless/iwlwifi/mvm/sta.c

Simple merge
Simple merge