Johan Hedberg 46479e6985 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git ... Conflicts: include/net/bluetooth/l2cap.h net/bluetooth/hci_conn.c net/bluetooth/l2cap_core.c		2012-02-16 14:25:34 +02:00
..
ath3k.c	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
bcm203x.c	USB: convert drivers/bluetooth/* to use module_usb_driver()	2011-11-18 09:47:34 -08:00
bfusb.c	Bluetooth: Remove hci_dev->driver_data	2012-02-13 17:01:37 +02:00
bluecard_cs.c	Bluetooth: Remove hci_dev->driver_data	2012-02-13 17:01:37 +02:00
bpa10x.c	Bluetooth: Remove hci_dev->driver_data	2012-02-13 17:01:37 +02:00
bt3c_cs.c	Bluetooth: Remove hci_dev->driver_data	2012-02-13 17:01:37 +02:00
btmrvl_debugfs.c	Bluetooth: Remove hci_dev->driver_data	2012-02-13 17:01:37 +02:00
btmrvl_drv.h
btmrvl_main.c	Bluetooth: Remove hci_dev->driver_data	2012-02-13 17:01:37 +02:00
btmrvl_sdio.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2011-12-09 14:07:12 -05:00
btmrvl_sdio.h
btsdio.c	Bluetooth: Remove hci_dev->driver_data	2012-02-13 17:01:37 +02:00
btuart_cs.c	Bluetooth: Remove hci_dev->driver_data	2012-02-13 17:01:37 +02:00
btusb.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git	2012-02-16 14:25:34 +02:00
btwilink.c	Bluetooth: Remove hci_dev->driver_data	2012-02-13 17:01:37 +02:00
dtl1_cs.c	Bluetooth: Remove hci_dev->driver_data	2012-02-13 17:01:37 +02:00
hci_ath.c	Bluetooth: hci-uart-ath: Use GFP_ATOMIC in open()	2012-02-13 17:01:22 +02:00
hci_bcsp.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git	2012-02-16 14:25:34 +02:00
hci_h4.c	Bluetooth: hci-uart-h4: Use GFP_ATOMIC in open()	2012-02-13 17:01:22 +02:00
hci_ldisc.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git	2012-02-16 14:25:34 +02:00
hci_ll.c	Bluetooth: hci-uart-ll: Use GFP_ATOMIC in open()	2012-02-13 17:01:22 +02:00
hci_uart.h
hci_vhci.c	Bluetooth: Remove hci_dev->driver_data	2012-02-13 17:01:37 +02:00
Kconfig	Bluetooth: btmrvl: support Marvell Bluetooth device SD8797	2011-11-21 13:52:31 -02:00
Makefile