Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...

diff --cc drivers/net/wireless/libertas/main.c
Simple merge

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

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

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