Merge remote-tracking branch 'bluetooth/master'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 10 Jun 2014 02:12:06 +0000 (12:12 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 10 Jun 2014 02:12:06 +0000 (12:12 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 02:12:06 +0000 (12:12 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 02:12:06 +0000 (12:12 +1000)
diff --cc drivers/bluetooth/ath3k.c
Simple merge
diff --cc net/bluetooth/hci_conn.c
Simple merge
diff --cc net/bluetooth/l2cap_core.c
Simple merge
diff --cc net/bluetooth/l2cap_sock.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Jun 2014 02:12:06 +0000 (12:12 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Jun 2014 02:12:06 +0000 (12:12 +1000)
		1	2
drivers/bluetooth/ath3k.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_conn.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