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

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

Fri, 27 Apr 2012 19:16:43 +0000 (15:16 -0400)

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

Fri, 27 Apr 2012 19:16:43 +0000 (15:16 -0400)
author John W. Linville <linville@tuxdriver.com>
Fri, 27 Apr 2012 19:16:43 +0000 (15:16 -0400)
committer John W. Linville <linville@tuxdriver.com>
Fri, 27 Apr 2012 19:16:43 +0000 (15:16 -0400)
diff --cc net/bluetooth/hci_core.c
Simple merge
diff --cc net/bluetooth/hci_event.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Fri, 27 Apr 2012 19:16:43 +0000 (15:16 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 27 Apr 2012 19:16:43 +0000 (15:16 -0400)
		1	2
net/bluetooth/hci_core.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_event.c	patch \|	diff1 \|	diff2 \|	blob \| history