Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

This commit is contained in:
Gustavo F. Padovan 2011-03-31 16:26:01 -03:00
commit 220b881a77
7 changed files with 26 additions and 7 deletions

View file

@ -84,6 +84,8 @@ enum {
HCI_SERVICE_CACHE,
HCI_LINK_KEYS,
HCI_DEBUG_KEYS,
HCI_RESET,
};
/* HCI ioctl defines */