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

Conflicts:

	drivers/net/wireless/zd1211rw/zd_mac.h
	net/ieee80211/softmac/ieee80211softmac_assoc.c

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

diff --cc drivers/net/wireless/hostap/hostap_cs.c
index ee542ec6d6a8cd03d97cd0d8f8fdb985c0327275,ef470e6e1c2a4001bbd53a96c879670c372aaa31..8d8f4b9b8b07a032ef3c04ac1b928ca4187c289e
--- 1/drivers/net/wireless/hostap/hostap_cs.c
--- 2/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@@ -568,8 -571,8 +568,7 @@@ static int prism2_config(struct pcmcia_
                ret = -ENOMEM;
                goto failed;
        }
-       memset(hw_priv, 0, sizeof(*hw_priv));
  
 -      tuple.DesiredTuple = CISTPL_CONFIG;
        tuple.Attributes = 0;
        tuple.TupleData = buf;
        tuple.TupleDataMax = sizeof(buf);

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

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

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

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

diff --cc drivers/net/wireless/prism54/isl_ioctl.c
Simple merge

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

diff --cc drivers/net/wireless/zd1211rw/zd_mac.h
index d4e8b870409d144c8711b5cb9dc73d5f156e1e21,77f1268080ed7581f516ee0ed9fe64dcbd2ebbfb..f0cf05dc7d3e0c9e5d36b32c348b2bac38c76c04
--- 1/drivers/net/wireless/zd1211rw/zd_mac.h
--- 2/drivers/net/wireless/zd1211rw/zd_mac.h
+++ b/drivers/net/wireless/zd1211rw/zd_mac.h
@@@ -133,8 -133,10 +133,10 @@@ struct zd_mac 
        struct iw_statistics iw_stats;
  
        struct housekeeping housekeeping;
 -      struct work_struct set_rts_cts_work;
 -      struct work_struct set_basic_rates_work;
+       struct work_struct set_multicast_hash_work;
+       struct zd_mc_hash multicast_hash;
 +      struct delayed_work set_rts_cts_work;
 +      struct delayed_work set_basic_rates_work;
  
        unsigned int stats_count;
        u8 qual_buffer[ZD_MAC_STATS_BUFFER_SIZE];

diff --cc net/ieee80211/softmac/ieee80211softmac_assoc.c
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_auth.c
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_priv.h
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_wx.c
Simple merge