iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49ce9c2cda
linux/drivers/bluetooth
History
David S. Miller e486463e82 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-25 15:50:32 -07:00
..
ath3k.c Bluetooth: add support for atheros 0930:0219 2012-06-11 23:54:33 -03:00
bcm203x.c USB: Disable hub-initiated LPM for comms devices. 2012-05-18 15:42:55 -07:00
bfusb.c USB: Disable hub-initiated LPM for comms devices. 2012-05-18 15:42:55 -07:00
bluecard_cs.c Bluetooth: Remove 'register' usage from the subsystem 2012-06-05 06:34:07 +03:00
bpa10x.c Bluetooth: Rename HCI_QUIRK_NO_RESET to HCI_QUIRK_RESET_ON_CLOSE 2012-06-05 06:34:06 +03:00
bt3c_cs.c Bluetooth: Remove 'register' usage from the subsystem 2012-06-05 06:34:07 +03:00
btmrvl_debugfs.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
btmrvl_drv.h Bluetooth: btmrvl: Do not send vendor events to bluetooth stack 2012-06-19 00:19:11 -03:00
btmrvl_main.c Bluetooth: btmrvl: Do not send vendor events to bluetooth stack 2012-06-19 00:19:11 -03:00
btmrvl_sdio.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
btmrvl_sdio.h Bluetooth: btmrvl: support Marvell Bluetooth device SD8787 2011-04-13 12:20:05 -03:00
btsdio.c Bluetooth: Remove hci_dev->driver_data 2012-02-13 17:01:37 +02:00
btuart_cs.c Bluetooth: Remove 'register' usage from the subsystem 2012-06-05 06:34:07 +03:00
btusb.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
btwilink.c Bluetooth: Remove hci_dev->driver_data 2012-02-13 17:01:37 +02:00
dtl1_cs.c Bluetooth: Remove 'register' usage from the subsystem 2012-06-05 06:34:07 +03:00
hci_ath.c Bluetooth: hci-uart-ath: Use GFP_ATOMIC in open() 2012-02-13 17:01:22 +02:00
hci_bcsp.c Bluetooth: Remove 'register' usage from the subsystem 2012-06-05 06:34:07 +03:00
hci_h4.c Bluetooth: Remove 'register' usage from the subsystem 2012-06-05 06:34:07 +03:00
hci_ldisc.c Bluetooth: Rename HCI_QUIRK_NO_RESET to HCI_QUIRK_RESET_ON_CLOSE 2012-06-05 06:34:06 +03:00
hci_ll.c Bluetooth: Remove 'register' usage from the subsystem 2012-06-05 06:34:07 +03:00
hci_uart.h Bluetooth: Add support for creating HCI UART based AMP controllers 2012-02-24 20:15:34 +02:00
hci_vhci.c Bluetooth: vhci: Ignore return code of nonseekable_open() 2012-05-09 00:41:36 -03:00
Kconfig Bluetooth: btmrvl: support Marvell Bluetooth device SD8797 2011-11-21 13:52:31 -02:00
Makefile Bluetooth: btwilink driver 2011-02-23 14:39:10 -08:00