net/bluetooth/hci_conn.c · a5eb1aeb25df89c627248a162cc35ffb556dc486 · nexedi / linux

John W. Linville authored May 29, 2014

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

Conflicts:
	drivers/bluetooth/btusb.c

a5eb1aeb

hci_conn.c 31.1 KB