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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/wireless/hostap/hostap_wlan.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-commands.h
index c579965ec55655c357b00ae0e01f66e0a29c5683,498492565912d592304370cee770e7a1d5dd7729..28b1098334f7e805813d0ac87477d3093d8e4a83
--- 1/drivers/net/wireless/iwlwifi/iwl-commands.h
--- 2/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@@ -1364,12 -1364,12 +1364,12 @@@ struct iwl_rx_phy_res 
        __le32 rate_n_flags;    /* RATE_MCS_* */
        __le16 byte_count;      /* frame's byte-count */
        __le16 reserved3;
 -} __attribute__ ((packed));
 +} __packed;
  
- struct iwl4965_rx_mpdu_res_start {
+ struct iwl_rx_mpdu_res_start {
        __le16 byte_count;
        __le16 reserved;
 -} __attribute__ ((packed));
 +} __packed;
  
  
  /******************************************************************************

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

diff --cc drivers/net/wireless/rt2x00/rt2800.h
Simple merge

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

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

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

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

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

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

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