Commit 1025c04c authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

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

Conflicts:
	net/bluetooth/hci_core.c
parents 4375f103 5bcecf32
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment