From: David S. Miller <davem@davemloft.net>
Date: Mon, 27 Jul 2015 04:53:08 +0000 (-0700)
Subject: Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=03de104f7b62b4cebd8a3d33cef82d48ff28144c;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'for-upstream' of git://git./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>
---

03de104f7b62b4cebd8a3d33cef82d48ff28144c