Gustavo F. Padovan 4b0b2f088f Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth ... Conflicts: net/bluetooth/l2cap_core.c		2011-12-19 11:37:53 -02:00
..
core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth	2011-12-19 11:37:53 -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	Bluetooth: replace list_for_each with list_for_each_entry whenever possible	2011-11-07 17:24:46 -02:00