Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorDavid S. Miller <davem@davemloft.net>
Thu, 16 Jul 2015 04:59:23 +0000 (21:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 Jul 2015 04:59:23 +0000 (21:59 -0700)
Johan Hedberg says:

====================
pull request: bluetooth 2015-07-15

Here's a regression fix for Broadcom Bluetooth adapters found at least
in certain Apple laptops. The issue was introduced in 4.1 so there's the
appropriate "Cc: stable" entry for it.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge