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

Commit 5d949944 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 into for-davem
parents a21d4572 b4838d12

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -1521,8 +1521,8 @@ M: Gustavo Padovan <gustavo@padovan.org> 
M:	Johan Hedberg <johan.hedberg@gmail.com>

L:	linux-bluetooth@vger.kernel.org

W:	http://www.bluez.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git

S:	Maintained

F:	drivers/bluetooth/
@@ -1532,8 +1532,8 @@ M: Gustavo Padovan <gustavo@padovan.org> 
M:	Johan Hedberg <johan.hedberg@gmail.com>

L:	linux-bluetooth@vger.kernel.org

W:	http://www.bluez.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git

S:	Maintained

F:	net/bluetooth/

F:	include/net/bluetooth/

drivers/bcma/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ config BCMA_HOST_PCI 


config BCMA_DRIVER_PCI_HOSTMODE

	bool "Driver for PCI core working in hostmode"

	depends on BCMA && MIPS

	depends on BCMA && MIPS && BCMA_HOST_PCI

	help

	  PCI core hostmode operation (external PCI bus).

drivers/bcma/driver_pci_host.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



#include "bcma_private.h"

#include <linux/pci.h>

#include <linux/export.h>

#include <linux/bcma/bcma.h>

#include <asm/paccess.h>

drivers/bluetooth/ath3k.c

+4 −0
Original line number Diff line number Diff line
@@ -72,7 +72,9 @@ static struct usb_device_id ath3k_table[] = { 


	/* Atheros AR3012 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x3004) },

	{ USB_DEVICE(0x0CF3, 0x311D) },

	{ USB_DEVICE(0x13d3, 0x3375) },

	{ USB_DEVICE(0x04CA, 0x3005) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -89,7 +91,9 @@ static struct usb_device_id ath3k_blist_tbl[] = { 


	/* Atheros AR3012 with sflash firmware*/

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },



	{ }	/* Terminating entry */

};

drivers/bluetooth/btusb.c

+4 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static struct usb_device_id btusb_table[] = { 
	{ USB_DEVICE_INFO(0xe0, 0x01, 0x01) },



	/* Broadcom SoftSailing reporting vendor specific */

	{ USB_DEVICE(0x05ac, 0x21e1) },

	{ USB_DEVICE(0x0a5c, 0x21e1) },



	/* Apple MacBookPro 7,1 */

	{ USB_DEVICE(0x05ac, 0x8213) },
@@ -103,6 +103,7 @@ static struct usb_device_id btusb_table[] = { 
	/* Broadcom BCM20702A0 */

	{ USB_DEVICE(0x0a5c, 0x21e3) },

	{ USB_DEVICE(0x0a5c, 0x21e6) },

	{ USB_DEVICE(0x0a5c, 0x21e8) },

	{ USB_DEVICE(0x0a5c, 0x21f3) },

	{ USB_DEVICE(0x413c, 0x8197) },
@@ -129,7 +130,9 @@ static struct usb_device_id blacklist_table[] = { 


	/* Atheros 3012 with sflash firmware */

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },