Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
authorMarcel Holtmann <marcel@holtmann.org>
Thu, 3 Jul 2014 14:39:39 +0000 (16:39 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 3 Jul 2014 14:39:39 +0000 (16:39 +0200)

Trivial merge