John W. Linville b67afe7f43 Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 ... Conflicts: drivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c		2011-02-18 17:03:41 -05:00
..
core.c	Bluetooth: remove l2cap_load() hack	2011-02-15 09:45:52 -03:00
Kconfig
Makefile
sock.c	Bluetooth: clean up rfcomm code	2010-12-01 21:04:43 -02:00
tty.c	Bluetooth: Release BTM while sleeping to avoid deadlock	2011-02-16 15:54:11 -03:00