diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-07 16:51:14 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-07 16:51:14 +0100 |
| commit | 89036a2a9852f70dcec97d5962974fe806828382 (patch) | |
| tree | 664636cc767a85f98613a5178b564df4afafeddb /net/sched/sch_netem.c | |
| parent | fsl/fman: avoid sleeping in atomic context while adding an address (diff) | |
| parent | Bluetooth: Fix missing encryption refresh on Security Request (diff) | |
| download | linux-89036a2a9852f70dcec97d5962974fe806828382.tar.xz linux-89036a2a9852f70dcec97d5962974fe806828382.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
pull request: bluetooth 2018-03-05
Here are a few more Bluetooth fixes for the 4.16 kernel:
- btusb: reset/resume fixes for Yoga 920 and Dell OptiPlex 3060
- Fix for missing encryption refresh with the Security Manager protocol
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_netem.c')
0 files changed, 0 insertions, 0 deletions