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

author John W. Linville <[email protected]>

Mon, 18 Mar 2013 19:17:11 +0000 (15:17 -0400)

committer John W. Linville <[email protected]>

Mon, 18 Mar 2013 19:17:11 +0000 (15:17 -0400)
author John W. Linville <[email protected]>
Mon, 18 Mar 2013 19:17:11 +0000 (15:17 -0400)
committer John W. Linville <[email protected]>
Mon, 18 Mar 2013 19:17:11 +0000 (15:17 -0400)
diff --cc drivers/bluetooth/ath3k.c
Simple merge
diff --cc net/bluetooth/sco.c
Simple merge
author	John W. Linville <[email protected]>
	Mon, 18 Mar 2013 19:17:11 +0000 (15:17 -0400)
committer	John W. Linville <[email protected]>
	Mon, 18 Mar 2013 19:17:11 +0000 (15:17 -0400)
		1	2
drivers/bluetooth/ath3k.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	patch \|	diff1 \|	diff2 \|	blob \| history