diff options
author | Kalle Valo <kvalo@kernel.org> | 2023-01-17 12:36:25 +0100 |
---|---|---|
committer | Kalle Valo <kvalo@kernel.org> | 2023-01-17 12:36:25 +0100 |
commit | d0e99511834b6828c960e978d9a8cb6e5731250d (patch) | |
tree | e7b062c1f9d28a55083477a1462286a7923a57fd /Documentation/devicetree/bindings/clock/imx31-clock.yaml | |
parent | wifi: rtl8xxxu: Dump the efuse only for untested devices (diff) | |
parent | Revert "wifi: mac80211: fix memory leak in ieee80211_if_add()" (diff) | |
download | linux-d0e99511834b6828c960e978d9a8cb6e5731250d.tar.xz linux-d0e99511834b6828c960e978d9a8cb6e5731250d.zip |
Merge wireless into wireless-next
Due to the two cherry picked commits from wireless to wireless-next we have
several conflicts in mt76. To avoid any bugs with conflicts merge wireless into
wireless-next.
96f134dc1964 wifi: mt76: handle possible mt76_rx_token_consume failures
fe13dad8992b wifi: mt76: dma: do not increment queue head if mt76_dma_add_buf fails
Diffstat (limited to 'Documentation/devicetree/bindings/clock/imx31-clock.yaml')
-rw-r--r-- | Documentation/devicetree/bindings/clock/imx31-clock.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/imx31-clock.yaml b/Documentation/devicetree/bindings/clock/imx31-clock.yaml index 168c8ada5e81..50a8498eef8a 100644 --- a/Documentation/devicetree/bindings/clock/imx31-clock.yaml +++ b/Documentation/devicetree/bindings/clock/imx31-clock.yaml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/clock/imx31-clock.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Clock bindings for Freescale i.MX31 +title: Freescale i.MX31 Clock Controller maintainers: - Fabio Estevam <festevam@gmail.com> |