]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless-next/master'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:35:39 +0000 (14:35 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:35:39 +0000 (14:35 +0200)
commitf5f783e7a1bbb8a6540c35efc3cede9c6bc73a4d
tree5aaa69a4e6f1ec479372e58e4a904964103a3a9d
parentd12775f173bb9ca71bd2ded4b4c4d78a3735020a
parenta1b13b9ad3759dca24c6b721ee026c540a4e6564
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
drivers/net/wireless/iwlwifi/pcie/drv.c
18 files changed:
drivers/net/wireless/ath/ath10k/debug.h
drivers/net/wireless/ath/ath10k/wmi.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/atmel.c
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
drivers/net/wireless/iwlwifi/iwl-config.h
drivers/net/wireless/iwlwifi/mvm/power.c
drivers/net/wireless/iwlwifi/mvm/rs.h
drivers/net/wireless/iwlwifi/mvm/scan.c
drivers/net/wireless/iwlwifi/pcie/drv.c
drivers/net/wireless/iwlwifi/pcie/tx.c
include/net/bluetooth/bluetooth.h
include/net/bluetooth/hci_core.h
include/net/bluetooth/rfcomm.h