John W. Linville 704278ccb5 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth ... Conflicts: net/bluetooth/hci_core.c		2013-07-31 15:11:50 -04:00
..
ath3k.c	Bluetooth: Add support for Atheros [0cf3:e003]	2013-07-25 19:52:37 +01:00
bcm203x.c
bfusb.c
bluecard_cs.c
bpa10x.c
bt3c_cs.c
btmrvl_debugfs.c
btmrvl_drv.h
btmrvl_main.c
btmrvl_sdio.c	Bluetooth: btmrvl: fix error return code in btmrvl_sdio_card_to_host()	2013-06-13 13:32:28 -04:00
btmrvl_sdio.h
btsdio.c
btuart_cs.c
btusb.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth	2013-07-31 15:11:50 -04:00
btwilink.c
dtl1_cs.c
hci_ath.c
hci_bcsp.c
hci_h4.c
hci_h5.c
hci_ldisc.c
hci_ll.c
hci_uart.h
hci_vhci.c
Kconfig
Makefile