From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Date: Fri, 27 Sep 2013 14:56:14 +0000 (-0300)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
X-Git-Tag: v3.13-rc1~105^2~225^2~24^2~40
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1025c04cecd19882e28f16c4004034b475c372c5;p=pandora-kernel.git

Merge git://git./linux/kernel/git/bluetooth/bluetooth

Conflicts:
	net/bluetooth/hci_core.c
---

1025c04cecd19882e28f16c4004034b475c372c5
Reading git-diff-tree failed