Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Mar 2013 19:17:11 +0000 (15:17 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Mar 2013 19:17:11 +0000 (15:17 -0400)
commit8fa48cbdfb0b7c2e39a8f2a46f987afe9b9c0579
tree187728296c1ee053106ed26cb09e13c331faad64
parent9437a248e7cac427c898bdb11bd1ac6844a1ead4
parentebaf5795ef57a70a042ea259448a465024e2821d
Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth
drivers/bluetooth/ath3k.c
net/bluetooth/sco.c