Merge tag 'v3.13' into 802.11p

Linux 3.13

Conflicts:
	drivers/net/wireless/ath/regd.c
	net/mac80211/cfg.c
	net/mac80211/mlme.c
	net/mac80211/rx.c
	net/wireless/ibss.c