Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Aug 2012 18:41:38 +0000 (14:41 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Aug 2012 18:41:38 +0000 (14:41 -0400)
commitbbf2e65258302c42d74fd53b3d92d6d8f03aaeff
treeea5c85947305d81e3b2a2b0cc4c2b036fdfb870e
parent50e2a30cf6fcaeb2d27360ba614dd169a10041c5
parent2096ae6ca647302d50a68aa36cb66a00e7dfac70
Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth