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

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

Conflicts:
	net/bluetooth/rfcomm/sock.c
parents 5a9d0a3f 6de6c18d
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