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)
commit15f6d96ded057b898312b0a088a964d585a779b1
tree611abf2de01ce27690360588d69cc11071ea774a
parent94e92a7bff2317bedd67ed7c46ac63e9affb7a99
parent8f9c98df949333f08b74e5df1caacf7e2c5e8552
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.
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