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

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

Mon, 15 Dec 2014 18:23:09 +0000 (13:23 -0500)

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

Mon, 15 Dec 2014 18:23:09 +0000 (13:23 -0500)
author John W. Linville <linville@tuxdriver.com>
Mon, 15 Dec 2014 18:23:09 +0000 (13:23 -0500)
committer John W. Linville <linville@tuxdriver.com>
Mon, 15 Dec 2014 18:23:09 +0000 (13:23 -0500)
diff --cc net/bluetooth/l2cap_core.c
Simple merge
diff --cc net/bluetooth/mgmt.c
Simple merge
diff --cc net/bluetooth/smp.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Mon, 15 Dec 2014 18:23:09 +0000 (13:23 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 15 Dec 2014 18:23:09 +0000 (13:23 -0500)
		1	2
net/bluetooth/l2cap_core.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/mgmt.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/smp.c	patch \|	diff1 \|	diff2 \|	blob \| history