Gustavo F. Padovan 448f2627c1 Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 ...

Conflicts:
	net/bluetooth/rfcomm/sock.c

2011-06-09 16:33:54 -03:00

22 KiB

Raw Blame History

View Raw