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

diff --combined drivers/net/wireless/brcm80211/brcmfmac/usb.c
index c5a34ffe64599e9d5852aeec83f93ab00a215901,3e3524756263e33808af714bab7c564b9df9ea86..a299d42da8e74a358939b8fa5da8a32a01fd312b
--- 1/drivers/net/wireless/brcm80211/brcmfmac/usb.c
--- 2/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@@ -28,6 -28,7 +28,7 @@@
  #include <linux/uaccess.h>
  #include <linux/firmware.h>
  #include <linux/usb.h>
+ #include <linux/vmalloc.h>
  #include <net/cfg80211.h>
  
  #include <defs.h>
@@@ -1239,7 -1240,7 +1240,7 @@@ static int brcmf_usb_get_fw(struct brcm
                return -EINVAL;
        }
  
-       devinfo->image = kmalloc(fw->size, GFP_ATOMIC); /* plus nvram */
+       devinfo->image = vmalloc(fw->size); /* plus nvram */
        if (!devinfo->image)
                return -ENOMEM;
  
@@@ -1596,14 -1597,13 +1597,14 @@@ static struct usb_driver brcmf_usbdrvr 
        .id_table = brcmf_usb_devid_table,
        .suspend = brcmf_usb_suspend,
        .resume = brcmf_usb_resume,
 -      .supports_autosuspend = 1
 +      .supports_autosuspend = 1,
 +      .disable_hub_initiated_lpm = 1,
  };
  
  void brcmf_usb_exit(void)
  {
        usb_deregister(&brcmf_usbdrvr);
-       kfree(g_image.data);
+       vfree(g_image.data);
        g_image.data = NULL;
        g_image.len = 0;
  }