Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --cc MAINTAINERS
Simple merge

diff --cc include/net/mac80211.h
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

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

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

diff --cc net/wireless/wext-core.c
Simple merge