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

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

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

diff --cc net/mac80211/agg-tx.c
Simple merge