Skip to content
Commit 4b0b2f08 authored by Gustavo F. Padovan's avatar Gustavo F. Padovan
Browse files

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

Conflicts:
	net/bluetooth/l2cap_core.c
parents 4dad9992 d7660918
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment