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

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

Thu, 5 Jun 2014 18:10:07 +0000 (14:10 -0400)

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

Thu, 5 Jun 2014 18:10:07 +0000 (14:10 -0400)
author John W. Linville <linville@tuxdriver.com>
Thu, 5 Jun 2014 18:10:07 +0000 (14:10 -0400)
committer John W. Linville <linville@tuxdriver.com>
Thu, 5 Jun 2014 18:10:07 +0000 (14:10 -0400)
diff --cc drivers/bluetooth/ath3k.c
Simple merge
diff --cc net/bluetooth/6lowpan.c
Simple merge
diff --cc net/bluetooth/hci_event.c
Simple merge
diff --cc net/bluetooth/l2cap_core.c
Simple merge
diff --cc net/bluetooth/l2cap_sock.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Thu, 5 Jun 2014 18:10:07 +0000 (14:10 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Thu, 5 Jun 2014 18:10:07 +0000 (14:10 -0400)
		1	2
drivers/bluetooth/ath3k.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/6lowpan.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_event.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_sock.c	patch \|	diff1 \|	diff2 \|	blob \| history