Gustavo Padovan 1025c04cec Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth ... Conflicts: net/bluetooth/hci_core.c		2013-09-27 11:56:14 -03:00
..
core.c	Bluetooth: fix error return code in rfcomm_add_listener()	2013-03-20 14:17:52 -03:00
Kconfig	tty: Added a CONFIG_TTY option to allow removal of TTY	2013-01-18 16:15:27 -08:00
Makefile
sock.c	Bluetooth: Fix waiting for clearing of BT_SK_SUSPEND flag	2013-09-18 17:02:59 -05:00
tty.c	Bluetooth: don't release the port in rfcomm_dev_state_change()	2013-09-20 14:17:54 -05:00