Merge remote-tracking branch 'wireless-next/master'

diff --cc drivers/net/wireless/mwifiex/11n.c
Simple merge

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

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

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

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