diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-11-24 18:46:13 -0800 |
|---|---|---|
| committer | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-11-24 18:57:52 -0800 |
| commit | 5f04ed74a8a3bcb2122738b7eda857187e85aa34 (patch) | |
| tree | 7075c3fb36f28074caed4e8aa6e504263d21c98c /Documentation | |
| parent | dc83ef22cdb483027f1bf0892e466433ec5299bf (diff) | |
| parent | a4f95f31a9f38d9bb1fd313fcc2d0c0d48116ee3 (diff) | |
| download | linux-5f04ed74a8a3bcb2122738b7eda857187e85aa34.tar.bz2 | |
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 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/broadcom-bluetooth.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/broadcom-bluetooth.txt b/Documentation/devicetree/bindings/net/broadcom-bluetooth.txt index c749dc297624..f16b99571af1 100644 --- a/Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +++ b/Documentation/devicetree/bindings/net/broadcom-bluetooth.txt @@ -15,6 +15,7 @@ Required properties: * "brcm,bcm43438-bt" * "brcm,bcm4345c5" * "brcm,bcm43540-bt" + * "brcm,bcm4335a0" Optional properties: |