tree 187728296c1ee053106ed26cb09e13c331faad64
parent 9437a248e7cac427c898bdb11bd1ac6844a1ead4
parent ebaf5795ef57a70a042ea259448a465024e2821d
author John W. Linville <linville@tuxdriver.com> 1363634231 -0400
committer John W. Linville <linville@tuxdriver.com> 1363634231 -0400

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