From: David S. Miller <davem@davemloft.net>
Date: Tue, 2 Oct 2018 05:40:39 +0000 (-0700)
Subject: Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot... 
X-Git-Tag: v4.19-rc7~28^2~19
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=92d7c74b6f72a8a7d04970d5dcfb99673daaf91d;p=linux-2.6-block.git

Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth

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>
---

92d7c74b6f72a8a7d04970d5dcfb99673daaf91d