Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

Conflicts: net/bluetooth/hci_core.c
2013-09-27 11:56:14 -03:00 · 2013-09-27 11:56:14 -03:00 · 1025c04cec
commit 1025c04cec
parent 4375f1037d 5bcecf3253
5575 changed files with 380950 additions and 176159 deletions
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@ -104,6 +104,7 @@ enum {
 enum {
 	HCI_SETUP,
 	HCI_AUTO_OFF,
+	HCI_RFKILLED,
 	HCI_MGMT,
 	HCI_PAIRABLE,
 	HCI_SERVICE_CACHE,