John W. Linville 312fef7d18 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next ...

Conflicts:
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c

2011-11-09 14:54:33 -05:00

..

core.c

Bluetooth: rfcomm: Fix sleep in invalid context in rfcomm_security_cfm

2011-11-07 17:24:49 -02:00

Kconfig

…

Makefile

…

sock.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next

2011-11-09 14:54:33 -05:00

tty.c

…