David S. Miller 7009deab19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next ... Conflicts: drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h drivers/net/wireless/rtlwifi/rtl8188ee/phy.h drivers/net/wireless/rtlwifi/rtl8192ce/phy.h drivers/net/wireless/rtlwifi/rtl8192de/phy.h drivers/net/wireless/rtlwifi/rtl8723ae/phy.h Just some minor conflicts between the wireless-next changes and Joe Perches's "extern" removal from function prototypes in header files. John W. Linville says: ==================== Regarding the Bluetooth bits, Gustavo says: "The big work here is from Marcel and Johan. They did a lot of work in the L2CAP, HCI and MGMT layers. The most important ones are the addition of a new MGMT command to enable/disable LE advertisement and the introduction of the HCI user channel to allow applications to get directly and exclusive access to Bluetooth devices." As to the ath10k bits, Kalle says: "Bartosz dropped support for qca98xx hw1.0 hardware from ath10k, it's just too much to support it. Michal added support for the new firmware interface. Marek fixed WEP in AP and IBSS mode. Rest of the changes are minor fixes or cleanups." And also: "Major changes are: * throughput improvements including aligning the RX frames correctly and optimising HTT layer (Michal) * remove qca98xx hw1.0 support (Bartosz) * add support for firmware version 999.999.0.636 (Michal) * firmware htt statistics support (Kalle) * fix WEP in AP and IBSS mode (Marek) * fix a mutex unlock balance in debugfs file (Shafi) And of course there's a lot of smaller fixes and cleanup." For the wl12xx bits, Luca says: "Here are some patches intended for 3.13. Eliad is upstreaming a bunch of patches that have been pending in the internal tree. Mostly bugfixes and other small improvements." Along with that... Arend and friends bring us a batch of brcmfmac updates, Larry Finger offers some rtlwifi refactoring, and Sujith sends the usual batch of ath9k updates. As usual, there are a number of other small updates from a variety of players as well. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-07 15:40:44 -04:00
..
airport.c
cfg.c	cfg80211: pass a channel definition struct	2012-11-26 12:42:58 +01:00
cfg.h
fw.c	wireless, orinoco: release_firmware() tests for NULL, remove explicit tests before calls	2012-04-12 15:06:08 -04:00
fw.h
hermes_dld.c
hermes_dld.h
hermes_rid.h
hermes.c
hermes.h
hw.c
hw.h
Kconfig
main.c	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
main.h	wireless: drivers: make use of WLAN_EID_VENDOR_SPECIFIC	2012-10-18 09:01:54 +02:00
Makefile
mic.c
mic.h
orinoco_cs.c	drivers/net: use module_pcmcia_driver() in pcmcia drivers	2013-03-15 12:27:33 -07:00
orinoco_nortel.c	wireless: orinoco: remove unnecessary pci_set_drvdata()	2013-09-26 15:13:44 -04:00
orinoco_pci.c	wireless: orinoco: remove unnecessary pci_set_drvdata()	2013-09-26 15:13:44 -04:00
orinoco_pci.h	net/trivial: replace numeric with standard PM state macros	2013-06-28 22:11:48 -07:00
orinoco_plx.c	wireless: orinoco: remove unnecessary pci_set_drvdata()	2013-09-26 15:13:44 -04:00
orinoco_tmd.c	wireless: orinoco: remove unnecessary pci_set_drvdata()	2013-09-26 15:13:44 -04:00
orinoco_usb.c	orinoco_usb: fix memory leak in ezusb_access_ltv() when device disconnected	2013-06-14 13:37:16 -04:00
orinoco.h	orinoco: Remove extern from function prototypes	2013-09-24 18:06:22 -07:00
scan.c	cfg80211: pass wiphy to cfg80211_ref_bss/put_bss	2013-02-11 18:44:52 +01:00
scan.h
spectrum_cs.c	drivers/net: use module_pcmcia_driver() in pcmcia drivers	2013-03-15 12:27:33 -07:00
wext.c	orinoco: use is_zero_ether_addr() instead of memcmp()	2012-09-07 15:03:37 -04:00
wext.h