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

..

core.c

Bluetooth: Double check sec req for pre 2.1 device

2011-05-11 14:56:28 -03:00

Kconfig

…

Makefile

…

sock.c

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

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

tty.c

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-03-16 15:11:04 -07:00