tree 75c076d342fa2d17058c4033d44ef9565700fd84
parent 32cba57ba74be58589aeb4cb6496183e46a5e3e5
parent 25ba265390c09b0a2b2f3fd9ba82e37248b7a371
author David S. Miller <davem@davemloft.net> 1437972788 -0700
committer David S. Miller <davem@davemloft.net> 1437972788 -0700

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

Johan Hedberg says:

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

Here's another one-patch pull request for 4.2 which targets a potential
NULL pointer dereference in the LE Security Manager code that can be
triggered by using older user space tools. The issue has been there
since 4.0 so there's the appropriate "Cc: stable" in place.

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

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