From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 31 Jul 2013 19:11:50 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth... 
X-Git-Tag: v3.11-rc4~5^2~27^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=704278ccb5c9fcbe09d1be3657950c17fad18ba8;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth

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

704278ccb5c9fcbe09d1be3657950c17fad18ba8
Reading git-diff-tree failed