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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-rx.c

diff --cc drivers/net/wireless/b43/main.c
index e789792,6c0ea21..9b907a3
--- 1/drivers/net/wireless/b43/main.c
--- 2/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@@ -4280,15 -4364,11 +4364,13 @@@ static int b43_wireless_core_init(struc
        ssb_bus_powerup(bus, !(sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW));
        b43_upload_card_macaddress(dev);
        b43_security_init(dev);
-       if (!dev->suspend_in_progress)
-               b43_rng_init(wl);
+ 
+       ieee80211_wake_queues(dev->wl->hw);
  
 +      ieee80211_wake_queues(dev->wl->hw);
 +
        b43_set_status(dev, B43_STAT_INITIALIZED);
  
-       if (!dev->suspend_in_progress)
-               b43_leds_init(dev);
  out:
        return err;