diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-09-17 22:25:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-17 22:25:51 -0700 |
| commit | 1dbb2413cbfa7db7a337081af1f4119996522156 (patch) | |
| tree | a7f6df47570b5a416e22ef3f0223fc6d769cde00 /net/ipv4 | |
| parent | atm: deal with setting entry before mkip was called (diff) | |
| parent | Bluetooth: Delay check for conn->smp in smp_conn_security() (diff) | |
| download | linux-dev-1dbb2413cbfa7db7a337081af1f4119996522156.tar.xz linux-dev-1dbb2413cbfa7db7a337081af1f4119996522156.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
pull request: bluetooth 2015-09-17
Here's one important patch for the 4.3-rc series that fixes an issue
with Bluetooth LE encryption failing because of a too early check for
the SMP context.
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions