John W. Linville 211c17aaee Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ... Conflicts: drivers/net/wireless/ath/ath9k/main.c net/bluetooth/hci_event.c		2012-06-13 15:35:35 -04:00
..
a2mp.h	Bluetooth: A2MP: Manage incoming connections	2012-06-05 06:34:14 +03:00
bluetooth.h	Bluetooth: Remove unnecessary headers include	2012-06-05 06:34:08 +03:00
hci.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-06-13 15:35:35 -04:00
hci_core.h	Bluetooth: A2MP: Process A2MP Discover Request	2012-06-05 06:34:12 +03:00
hci_mon.h	Bluetooth: Fix coding style in all .h files	2012-03-07 00:04:25 -03:00
l2cap.h	Bluetooth: Create empty l2cap ops function	2012-06-05 06:34:16 +03:00
mgmt.h	Bluetooth: Add management command for setting Device ID	2012-05-09 00:41:30 -03:00
rfcomm.h	Bluetooth: rfcomm: Fix sleep in invalid context in rfcomm_security_cfm	2011-11-07 17:24:49 -02:00
sco.h	Bluetooth: clean up legal text	2010-12-01 21:04:43 -02:00
smp.h	Bluetooth: Correct ediv in SMP	2012-05-09 00:41:30 -03:00