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

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

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl-core.h
Simple merge

diff --cc drivers/net/wireless/zd1211rw/zd_mac.c
Simple merge