John W. Linville 252f4bf400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem ... Conflicts: drivers/net/wireless/ath/ar9170/main.c drivers/net/wireless/ath/ar9170/phy.c drivers/net/wireless/zd1211rw/zd_rf_rf2959.c		2011-04-12 16:18:44 -04:00
..
bnep	Bluetooth: Use kthread API in bnep	2011-04-05 12:40:47 -03:00
cmtp	Bluetooth: Use kthread API in cmtp	2011-04-05 12:40:47 -03:00
hidp	Bluetooth: Use kthread API in hidp	2011-04-05 12:40:46 -03:00
rfcomm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-03-16 16:29:25 -07:00
af_bluetooth.c	Bluetooth: remove unnecessary call to hci_sock_cleanup	2011-02-25 22:36:58 -03:00
hci_conn.c	Bluetooth: Use ERR_PTR as return error from hci_connect	2011-02-27 17:11:29 -03:00
hci_core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2011-04-12 16:18:44 -04:00
hci_event.c	Bluetooth: Add mgmt_remote_name event	2011-04-04 18:47:38 -03:00
hci_sock.c	Bluetooth: fix build break on hci_sock.c	2011-02-22 08:43:52 -03:00
hci_sysfs.c	Bluetooth: convert net/bluetooth/ to kstrtox	2011-04-05 13:21:11 -03:00
Kconfig	Bluetooth: Fix BT_L2CAP and BT_SCO in Kconfig	2011-02-28 14:06:53 -05:00
l2cap_core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6	2011-03-31 16:26:01 -03:00
l2cap_sock.c	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
lib.c	Bluetooth: make batostr() print in the right order	2010-10-12 12:44:52 -03:00
Makefile	Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko	2011-02-14 17:27:36 -03:00
mgmt.c	Bluetooth: Use GFP_KERNEL in user context	2011-04-05 13:03:10 -03:00
sco.c	Bluetooth: Use ERR_PTR as return error from hci_connect	2011-02-27 17:11:29 -03:00