Merge upstream into ieee80211.

Hand-fix merge conflict in drivers/usb/net/zd1201.c.

diff --cc drivers/net/wireless/Kconfig
Simple merge

diff --cc drivers/usb/net/zd1201.c
index 2a1d489,e32a80b..fc01397
--- 1/drivers/usb/net/zd1201.c
--- 2/drivers/usb/net/zd1201.c
+++ b/drivers/usb/net/zd1201.c
@@@ -345,12 -345,11 +345,11 @@@ static void zd1201_usbrx(struct urb *ur
  
                        if (datalen<14)
                                goto resubmit;
 -                      if ((seq & IEEE802_11_SCTL_FRAG) == 0) {
 +                      if ((seq & IEEE80211_SCTL_FRAG) == 0) {
-                               frag = kmalloc(sizeof(struct zd1201_frag*),
-                                   GFP_ATOMIC);
+                               frag = kmalloc(sizeof(*frag), GFP_ATOMIC);
                                if (!frag)
                                        goto resubmit;
 -                              skb = dev_alloc_skb(IEEE802_11_DATA_LEN +14+2);
 +                              skb = dev_alloc_skb(IEEE80211_DATA_LEN +14+2);
                                if (!skb) {
                                        kfree(frag);
                                        goto resubmit;