John W. Linville a5eb1aeb25 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next ... Conflicts: drivers/bluetooth/btusb.c		2014-05-29 13:03:47 -04:00
..
core.c	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next	2014-05-29 13:03:47 -04:00
Kconfig
Makefile
sock.c	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
tty.c	Bluetooth: Convert RFCOMM spinlocks into mutexes	2014-05-05 19:25:06 -07:00