Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorDavid S. Miller <davem@davemloft.net>
Tue, 2 Oct 2018 05:40:39 +0000 (22:40 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Oct 2018 05:40:39 +0000 (22:40 -0700)
Johan Hedberg says:

====================
pull request: bluetooth 2018-09-27

Here's one more Bluetooth fix for 4.19, fixing the handling of an
attempt to unpair a device while pairing is in progress.

Let me know if there are any issues pulling. Thanks.
====================

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

Trivial merge