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

diff --cc drivers/net/wireless/ath/ar9170/usb.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge

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

diff --cc drivers/net/wireless/hostap/hostap_80211_rx.c
Simple merge

diff --cc drivers/net/wireless/hostap/hostap_ioctl.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl3945-base.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2400pci.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2500pci.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2500usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00debug.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00pci.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00queue.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt61pci.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt73usb.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/wl1271_main.c
Simple merge

diff --cc include/net/mac80211.h
Simple merge

diff --cc net/mac80211/driver-ops.h
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

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

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

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