John W. Linville e11c259f74 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ... Conflicts: include/net/bluetooth/bluetooth.h		2011-11-17 13:11:43 -05:00
..
bluetooth.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2011-11-17 13:11:43 -05:00
hci.h	Bluetooth: Define HCI reasons instead of magic number	2011-11-08 12:53:11 -02:00
hci_core.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2011-11-17 13:11:43 -05:00
l2cap.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next	2011-11-09 14:54:33 -05:00
mgmt.h	Bluetooth: Add address type fields to mgmt messages that need them	2011-11-08 13:05:57 -02: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: Move SMP crypto functions to a workqueue	2011-09-21 12:58:12 -03:00