From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 25 Jun 2014 18:22:35 +0000 (-0400)
Subject: Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot... 
X-Git-Tag: v3.16~18^2~11^2~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8b87efba61420c1b99060de52c1b9cf46157eed1;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
---

8b87efba61420c1b99060de52c1b9cf46157eed1