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

Conflicts:
	drivers/net/wireless/ath/ath9k/recv.c

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

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

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

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