Merge tag 'mac80211-next-for-davem-2017-02-09' of git://git.kernel.org/pub/scm/linux...

Johannes Berg says:

====================
Some more updates:
 * use shash in mac80211 crypto code where applicable
 * some documentation fixes
 * pass RSSI levels up in change notifications
 * remove unused rfkill-regulator
 * various other cleanups
====================

Signed-off-by: David S. Miller <[email protected]>

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

diff --cc drivers/net/wireless/marvell/mwifiex/sta_event.c
Simple merge

diff --cc net/mac80211/fils_aead.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge