Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

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

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
Simple merge

diff --cc drivers/net/wireless/rndis_wlan.c
Simple merge

diff --cc include/linux/Kbuild
Simple merge

diff --cc net/bluetooth/bnep/core.c
Simple merge

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

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

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

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

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

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