From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 29 May 2014 17:03:47 +0000 (-0400)
Subject: Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~36^2~99^2^2~43
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5eb1aeb25df89c627248a162cc35ffb556dc486;p=pandora-kernel.git

Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth-next

Conflicts:
	drivers/bluetooth/btusb.c
---

a5eb1aeb25df89c627248a162cc35ffb556dc486
Reading git-diff-tree failed