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

…

tty.c

…