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

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/b43legacy/dma.c
index 203b0f42ac58f0d1edababbe468a9fa3177b7020,9736b2f56a7599785ba6637315d1fe7e46bc9218..eb0243a226917b060f56093d914c7aa460f32f4b
--- 1/drivers/net/wireless/b43legacy/dma.c
--- 2/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@@ -918,11 -916,12 +917,11 @@@ struct b43legacy_dmaring *b43legacy_set
                                goto err_kfree_txhdr_cache;
                }
  
-               dma_unmap_single(dev->dev->dma_dev,
-                                dma_test, sizeof(struct b43legacy_txhdr_fw3),
-                                DMA_TO_DEVICE);
+               ssb_dma_unmap_single(dev->dev, dma_test,
+                                    sizeof(struct b43legacy_txhdr_fw3),
+                                    DMA_TO_DEVICE);
        }
  
 -      ring->dev = dev;
        ring->nr_slots = nr_slots;
        ring->mmio_base = b43legacy_dmacontroller_base(type, controller_index);
        ring->index = controller_index;

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

diff --cc drivers/net/wireless/rt2x00/rt2500usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00.h
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00dev.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt73usb.c
Simple merge