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

author Gustavo F. Padovan <padovan@profusion.mobi>

Fri, 2 Dec 2011 23:26:25 +0000 (08:26 +0900)

committer Gustavo F. Padovan <padovan@profusion.mobi>

Fri, 2 Dec 2011 23:26:25 +0000 (08:26 +0900)
author Gustavo F. Padovan <padovan@profusion.mobi>
Fri, 2 Dec 2011 23:26:25 +0000 (08:26 +0900)
committer Gustavo F. Padovan <padovan@profusion.mobi>
Fri, 2 Dec 2011 23:26:25 +0000 (08:26 +0900)
diff --cc drivers/bluetooth/btusb.c
Simple merge
diff --cc net/bluetooth/bnep/core.c
Simple merge
diff --cc net/bluetooth/cmtp/core.c
Simple merge
diff --cc net/bluetooth/hci_event.c
Simple merge
author	Gustavo F. Padovan <padovan@profusion.mobi>
	Fri, 2 Dec 2011 23:26:25 +0000 (08:26 +0900)
committer	Gustavo F. Padovan <padovan@profusion.mobi>
	Fri, 2 Dec 2011 23:26:25 +0000 (08:26 +0900)
		1	2
drivers/bluetooth/btusb.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/bnep/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/cmtp/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_event.c	patch \|	diff1 \|	diff2 \|	blob \| history