]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorDavid S. Miller <davem@davemloft.net>
Tue, 11 Aug 2015 21:16:07 +0000 (14:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 Aug 2015 21:16:07 +0000 (14:16 -0700)
Johan Hedberg says:

====================
pull request: bluetooth 2015-08-11

Here's an important regression fix for the 4.2-rc series that ensures
user space isn't given invalid LTK values. The bug essentially prevents
the encryption of subsequent LE connections, i.e. makes it impossible to
pair devices over LE.

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

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

Trivial merge