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

diff --combined drivers/net/wireless/b43/main.c
index d59b016,7841b95..5af40d9
--- 1/drivers/net/wireless/b43/main.c
--- 2/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@@ -72,6 -72,7 +72,7 @@@ MODULE_FIRMWARE("b43/ucode11.fw")
  MODULE_FIRMWARE("b43/ucode13.fw");
  MODULE_FIRMWARE("b43/ucode14.fw");
  MODULE_FIRMWARE("b43/ucode15.fw");
+ MODULE_FIRMWARE("b43/ucode16_mimo.fw");
  MODULE_FIRMWARE("b43/ucode5.fw");
  MODULE_FIRMWARE("b43/ucode9.fw");
  
@@@ -4010,7 -4011,7 +4011,7 @@@ static int b43_wireless_core_start(stru
        b43_mac_enable(dev);
        b43_write32(dev, B43_MMIO_GEN_IRQ_MASK, dev->irq_mask);
  
 -      /* Start maintainance work */
 +      /* Start maintenance work */
        b43_periodic_tasks_setup(dev);
  
        b43_leds_init(dev);