Skip to content
Commit cbe461c5 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 

Conflicts:
	net/bluetooth/hci_event.c
parents 1d0c4da8 1c2e0041
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment