From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 26 Sep 2013 17:47:05 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth... 
X-Git-Tag: v3.12-rc4~30^2~39^2^2~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7c6a4acc645cdd938300d5f9bb367f72170af310;p=users%2Fhch%2Fdma-mapping.git

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

7c6a4acc645cdd938300d5f9bb367f72170af310