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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h

diff --cc drivers/net/wireless/airo.c
index 6b605df,053f90c..1d05445
--- 1/drivers/net/wireless/airo.c
--- 2/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@@ -5162,8 -5162,15 +5162,8 @@@ static void proc_SSID_on_close(struct i
        enable_MAC(ai, 1);
  }
  
 -static inline u8 hexVal(char c) {
 -      if (c>='0' && c<='9') return c -= '0';
 -      if (c>='a' && c<='f') return c -= 'a'-10;
 -      if (c>='A' && c<='F') return c -= 'A'-10;
 -      return 0;
 -}
 -
  static void proc_APList_on_close( struct inode *inode, struct file *file ) {
-       struct proc_data *data = (struct proc_data *)file->private_data;
+       struct proc_data *data = file->private_data;
        struct proc_dir_entry *dp = PDE(inode);
        struct net_device *dev = dp->data;
        struct airo_info *ai = dev->ml_priv;

diff --cc drivers/net/wireless/ipw2x00/ipw2100.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-commands.h
index 8d2db9d,83247f7..bd1ec93
--- 1/drivers/net/wireless/iwlwifi/iwl-commands.h
--- 2/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@@ -3035,8 -3035,9 +3035,9 @@@ struct iwl39_statistics_tx 
  struct statistics_dbg {
        __le32 burst_check;
        __le32 burst_count;
-       __le32 reserved[4];
+       __le32 wait_for_silence_timeout_cnt;
+       __le32 reserved[3];
 -} __attribute__ ((packed));
 +} __packed;
  
  struct iwl39_statistics_div {
        __le32 tx_on_a;

diff --cc drivers/net/wireless/libertas/host.h
Simple merge

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

diff --cc drivers/net/wireless/orinoco/orinoco_usb.c
Simple merge

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

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

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

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