diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-07 11:47:52 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-07 11:47:52 -0400 |
| commit | 7abccdba25be45630eede85053496f1f48d36ec8 (patch) | |
| tree | fd87c8b84b1c5fa2f5d1cc9ba36d33855f2a0a6b /crypto/algif_skcipher.c | |
| parent | c85d6975ef923cffdd56de3e0e6aba0977282cff (diff) | |
| parent | 38c8af60046edab4c9db5f26e79746b1bd52c837 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2015-04-04
Here's what's probably the last bluetooth-next pull request for 4.1:
- Fixes for LE advertising data & advertising parameters
- Fix for race condition with HCI_RESET flag
- New BNEPGETSUPPFEAT ioctl, needed for certification
- New HCI request callback type to get the resulting skb
- Cleanups to use BIT() macro wherever possible
- Consolidate Broadcom device entries in the btusb HCI driver
- Check for valid flags in CMTP, HIDP & BNEP
- Disallow local privacy & OOB data combo to prevent a potential race
- Expose SMP & ECDH selftest results through debugfs
- Expose current Device ID info through debugfs
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/algif_skcipher.c')
0 files changed, 0 insertions, 0 deletions