diff options
author | David S. Miller <davem@davemloft.net> | 2015-09-18 05:25:51 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-09-18 05:25:51 (GMT) |
commit | 1dbb2413cbfa7db7a337081af1f4119996522156 (patch) | |
tree | a7f6df47570b5a416e22ef3f0223fc6d769cde00 /drivers/net/arcnet/arcnet.c | |
parent | 34f5b0066435ffb793049b84fafd29fa195bcf90 (diff) | |
parent | d8949aad3eab5d396f4fefcd581773bf07b9a79e (diff) | |
download | linux-1dbb2413cbfa7db7a337081af1f4119996522156.tar.xz |
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 'drivers/net/arcnet/arcnet.c')
0 files changed, 0 insertions, 0 deletions