Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2026-10-18 19:12:56 +00:00 · 2014-07-11 15:52:57 -04:00 · 2014-07-11 15:52:57 -04:00 · 95d01a669b
commit 95d01a669b
parent 5e6438db34 ca424b2022
45 changed files with 3758 additions and 1478 deletions
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
--- a/drivers/bluetooth/btmrvl_drv.h
+++ b/drivers/bluetooth/btmrvl_drv.h
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
--- a/drivers/bluetooth/btmrvl_sdio.h
+++ b/drivers/bluetooth/btmrvl_sdio.h
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
--- a/drivers/net/wireless/mwifiex/11n_aggr.c
+++ b/drivers/net/wireless/mwifiex/11n_aggr.c
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
--- a/drivers/net/wireless/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
--- a/drivers/net/wireless/mwifiex/sta_tx.c
+++ b/drivers/net/wireless/mwifiex/sta_tx.c
--- a/drivers/net/wireless/mwifiex/tdls.c
+++ b/drivers/net/wireless/mwifiex/tdls.c
--- a/drivers/net/wireless/mwifiex/txrx.c
+++ b/drivers/net/wireless/mwifiex/txrx.c
--- a/drivers/net/wireless/mwifiex/uap_txrx.c
+++ b/drivers/net/wireless/mwifiex/uap_txrx.c
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
--- a/net/bluetooth/6lowpan.h
+++ b/net/bluetooth/6lowpan.h
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
--- a/net/bluetooth/Makefile
+++ b/net/bluetooth/Makefile
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
--- a/net/bluetooth/smp.h
+++ b/net/bluetooth/smp.h
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c