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

author John W. Linville <linville@tuxdriver.com>

Wed, 21 Nov 2012 18:03:00 +0000 (13:03 -0500)

committer John W. Linville <linville@tuxdriver.com>

Wed, 21 Nov 2012 18:03:00 +0000 (13:03 -0500)
author John W. Linville <linville@tuxdriver.com>
Wed, 21 Nov 2012 18:03:00 +0000 (13:03 -0500)
committer John W. Linville <linville@tuxdriver.com>
Wed, 21 Nov 2012 18:03:00 +0000 (13:03 -0500)
diff --cc drivers/bluetooth/btusb.c
Simple merge
diff --cc net/bluetooth/hci_core.c
Simple merge
diff --cc net/bluetooth/mgmt.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Wed, 21 Nov 2012 18:03:00 +0000 (13:03 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 21 Nov 2012 18:03:00 +0000 (13:03 -0500)
		1	2
drivers/bluetooth/btusb.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_core.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/mgmt.c	patch \|	diff1 \|	diff2 \|	blob \| history