Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae3568ad authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

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

MAINTAINERS

+5 −15
Original line number Diff line number Diff line
@@ -3671,7 +3671,7 @@ F: include/linux/mv643xx.h 
MARVELL MWL8K WIRELESS DRIVER

M:	Lennert Buytenhek <buytenh@wantstofly.org>

L:	linux-wireless@vger.kernel.org

S:	Maintained

S:	Odd Fixes

F:	drivers/net/wireless/mwl8k.c



MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
@@ -4522,7 +4522,7 @@ PRISM54 WIRELESS DRIVER 
M:	"Luis R. Rodriguez" <mcgrof@gmail.com>

L:	linux-wireless@vger.kernel.org

W:	http://prism54.org

S:	Maintained

S:	Obsolete

F:	drivers/net/wireless/prism54/



PROMISE DC4030 CACHING DISK CONTROLLER DRIVER
@@ -4712,9 +4712,8 @@ S: Maintained 
F:	drivers/rapidio/



RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER

M:	Corey Thomas <coreythomas@charter.net>

L:	linux-wireless@vger.kernel.org

S:	Maintained

S:	Orphan

F:	drivers/net/wireless/ray*



RCUTORTURE MODULE
@@ -6037,10 +6036,9 @@ F: Documentation/video4linux/zc0301.txt 
F:	drivers/media/video/zc0301/



USB ZD1201 DRIVER

M:	Jeroen Vreeken <pe1rxq@amsat.org>

L:	linux-usb@vger.kernel.org

L:	linux-wireless@vger.kernel.org

W:	http://linux-lc100020.sourceforge.net

S:	Maintained

S:	Orphan

F:	drivers/net/wireless/zd1201.*



USB ZR364XX DRIVER
@@ -6226,14 +6224,6 @@ F: Documentation/watchdog/ 
F:	drivers/watchdog/

F:	include/linux/watchdog.h



WAVELAN NETWORK DRIVER & WIRELESS EXTENSIONS

M:	Jean Tourrilhes <jt@hpl.hp.com>

L:	linux-wireless@vger.kernel.org

W:	http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/

S:	Maintained

F:	Documentation/networking/wavelan.txt

F:	drivers/staging/wavelan/



WD7000 SCSI DRIVER

M:	Miroslav Zagorac <zaga@fly.cc.fer.hr>

L:	linux-scsi@vger.kernel.org

drivers/bluetooth/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -58,6 +58,18 @@ config BT_HCIUART_BCSP 


	  Say Y here to compile support for HCI BCSP protocol.



config BT_HCIUART_ATH3K

	bool "Atheros AR300x serial support"

	depends on BT_HCIUART

	help

	  HCIATH3K (HCI Atheros AR300x) is a serial protocol for

	  communication between host and Atheros AR300x Bluetooth devices.

	  This protocol enables AR300x chips to be enabled with

	  power management support.

	  Enable this if you have Atheros AR300x serial Bluetooth device.



	  Say Y here to compile support for HCI UART ATH3K protocol.



config BT_HCIUART_LL

	bool "HCILL protocol support"

	depends on BT_HCIUART

drivers/bluetooth/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ hci_uart-y := hci_ldisc.o 
hci_uart-$(CONFIG_BT_HCIUART_H4)	+= hci_h4.o

hci_uart-$(CONFIG_BT_HCIUART_BCSP)	+= hci_bcsp.o

hci_uart-$(CONFIG_BT_HCIUART_LL)	+= hci_ll.o

hci_uart-$(CONFIG_BT_HCIUART_ATH3K)	+= hci_ath.o

hci_uart-objs				:= $(hci_uart-y)

drivers/bluetooth/bcm203x.c

+1 −2
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 


	BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);



	data->fw_data = kmalloc(firmware->size, GFP_KERNEL);

	data->fw_data = kmemdup(firmware->data, firmware->size, GFP_KERNEL);

	if (!data->fw_data) {

		BT_ERR("Can't allocate memory for firmware image");

		release_firmware(firmware);
@@ -234,7 +234,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
		return -ENOMEM;

	}



	memcpy(data->fw_data, firmware->data, firmware->size);

	data->fw_size = firmware->size;

	data->fw_sent = 0;

drivers/bluetooth/bpa10x.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ struct hci_vendor_hdr { 
	__u8    type;

	__le16  snum;

	__le16  dlen;

} __attribute__ ((packed));

} __packed;



static int bpa10x_recv(struct hci_dev *hdev, int queue, void *buf, int count)

{