diff options
author | 2019-11-24 18:46:13 -0800 | |
---|---|---|
committer | 2019-11-24 18:57:52 -0800 | |
commit | 5f04ed74a8a3bcb2122738b7eda857187e85aa34 (patch) | |
tree | 7075c3fb36f28074caed4e8aa6e504263d21c98c /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | ax88179_178a: add ethtool_op_get_ts_info() (diff) | |
parent | Bluetooth: btbcm: Use the BDADDR_PROPERTY quirk (diff) | |
download | wireguard-linux-5f04ed74a8a3bcb2122738b7eda857187e85aa34.tar.xz wireguard-linux-5f04ed74a8a3bcb2122738b7eda857187e85aa34.zip |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2019-11-24
Here's one last bluetooth-next pull request for the 5.5 kernel:
- Fix BDADDR_PROPERTY & INVALID_BDADDR quirk handling
- Added support for BCM4334B0 and BCM4335A0 controllers
- A few other smaller fixes related to locking and memory leaks
====================
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions