Skip to content
GitLab
Commit 828d7d7b authored by Gustavo F. Padovan's avatar Gustavo F. Padovan
Browse files

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

Conflicts:
	net/bluetooth/l2cap_core.c
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c
parents 26954c7f 069f40fc
Hide whitespace changes
Inline Side-by-side
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