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

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

Tue, 10 Jan 2012 20:44:17 +0000 (15:44 -0500)

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

Tue, 10 Jan 2012 20:44:17 +0000 (15:44 -0500)
author John W. Linville <linville@tuxdriver.com>
Tue, 10 Jan 2012 20:44:17 +0000 (15:44 -0500)
committer John W. Linville <linville@tuxdriver.com>
Tue, 10 Jan 2012 20:44:17 +0000 (15:44 -0500)
diff --cc net/bluetooth/hci_event.c
Simple merge
diff --cc net/bluetooth/hci_sock.c
Simple merge
diff --cc net/bluetooth/l2cap_core.c
Simple merge
diff --cc net/bluetooth/sco.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Tue, 10 Jan 2012 20:44:17 +0000 (15:44 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 10 Jan 2012 20:44:17 +0000 (15:44 -0500)
		1	2
net/bluetooth/hci_event.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_sock.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	patch \|	diff1 \|	diff2 \|	blob \| history