Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth

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

Wed, 2 Nov 2011 19:15:51 +0000 (15:15 -0400)

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

Wed, 2 Nov 2011 19:15:51 +0000 (15:15 -0400)
author John W. Linville <linville@tuxdriver.com>
Wed, 2 Nov 2011 19:15:51 +0000 (15:15 -0400)
committer John W. Linville <linville@tuxdriver.com>
Wed, 2 Nov 2011 19:15:51 +0000 (15:15 -0400)
diff --cc net/bluetooth/hci_core.c
Simple merge
diff --cc net/bluetooth/mgmt.c
Simple merge
diff --cc net/bluetooth/rfcomm/core.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Wed, 2 Nov 2011 19:15:51 +0000 (15:15 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 2 Nov 2011 19:15:51 +0000 (15:15 -0400)
		1	2
net/bluetooth/hci_core.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/mgmt.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/rfcomm/core.c	patch \|	diff1 \|	diff2 \|	blob \| history