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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/rt2x00/rt2800pci.c

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/wireless/ath/ath9k/rc.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-3945.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-3945.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-4965.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-5000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.h
index 1b0701b876c34cd37a5d5b7bacef688768e30bc1,3df79331039c2fb741e10fdb7c260a42b6472cb9..4ef7739f9e8e614c99293b9904039ad7bfa965cc
--- 1/drivers/net/wireless/iwlwifi/iwl-core.h
--- 2/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@@ -450,9 -451,7 +451,9 @@@ int iwl_tx_skb(struct iwl_priv *priv, s
  void iwl_hw_txq_ctx_free(struct iwl_priv *priv);
  int iwl_hw_tx_queue_init(struct iwl_priv *priv,
                         struct iwl_tx_queue *txq);
- int iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);
 +void iwl_free_tfds_in_queue(struct iwl_priv *priv,
 +                          int sta_id, int tid, int freed);
+ void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);
  int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
                      int slots_num, u32 txq_id);
  void iwl_tx_queue_free(struct iwl_priv *priv, int txq_id);

diff --cc drivers/net/wireless/iwlwifi/iwl-rx.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-tx.c
Simple merge

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

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

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

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

diff --cc drivers/net/wireless/rt2x00/rt2800pci.c
index d64181cbc9cb0910b3888df8bab986aae02c7e61,0e4c41766edcebd78c9f6dc8e4d5f9a87a3a089d..aca8c124f43458952275d72cbc51e460ce63a827
--- 1/drivers/net/wireless/rt2x00/rt2800pci.c
--- 2/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@@ -1190,8 -1184,11 +1184,11 @@@ static const struct rt2x00_ops rt2800pc
  /*
   * RT2800pci module information.
   */
 -static struct pci_device_id rt2800pci_device_table[] = {
 +static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = {
-       { PCI_DEVICE(0x1462, 0x891a), PCI_DEVICE_DATA(&rt2800pci_ops) },
+       { PCI_DEVICE(0x1814, 0x0601), PCI_DEVICE_DATA(&rt2800pci_ops) },
+       { PCI_DEVICE(0x1814, 0x0681), PCI_DEVICE_DATA(&rt2800pci_ops) },
+       { PCI_DEVICE(0x1814, 0x0701), PCI_DEVICE_DATA(&rt2800pci_ops) },
+       { PCI_DEVICE(0x1814, 0x0781), PCI_DEVICE_DATA(&rt2800pci_ops) },
        { PCI_DEVICE(0x1432, 0x7708), PCI_DEVICE_DATA(&rt2800pci_ops) },
        { PCI_DEVICE(0x1432, 0x7727), PCI_DEVICE_DATA(&rt2800pci_ops) },
        { PCI_DEVICE(0x1432, 0x7728), PCI_DEVICE_DATA(&rt2800pci_ops) },

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

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

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

diff --cc drivers/staging/rtl8192su/ieee80211/ieee80211.h
Simple merge

diff --cc drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
Simple merge

diff --cc drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c
Simple merge

diff --cc drivers/staging/rtl8192su/r8192U_core.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge