diff options
| author | Jason Liu <jason.hui.liu@nxp.com> | 2022-05-21 15:32:59 -0500 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2022-06-29 11:35:21 -0500 |
| commit | eba369f0f66db8e57d52d788f455ebf80b52efa1 (patch) | |
| tree | 8fbf20f34a2ac5ae285d083dde786560b0969ee9 /Documentation/devicetree/bindings/memory-controllers | |
| parent | 056b375c471639e87c8f5cb49aeebab87ff8015c (diff) | |
| parent | 9f43e3ac7e662f352f829077723fa0b92ccaded1 (diff) | |
Merge tag 'v5.15.41' into lf-5.15.y
This is the 5.15.41 stable release
* tag 'v5.15.41': (1977 commits)
Linux 5.15.41
usb: gadget: uvc: allow for application to cleanly shutdown
usb: gadget: uvc: rename function to be more consistent
...
Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
Conflicts:
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
arch/arm64/configs/defconfig
drivers/clk/imx/clk-imx8qxp-lpcg.c
drivers/dma/imx-sdma.c
drivers/gpu/drm/bridge/nwl-dsi.c
drivers/mailbox/imx-mailbox.c
drivers/net/phy/at803x.c
drivers/tty/serial/fsl_lpuart.c
security/keys/trusted-keys/trusted_core.c
Diffstat (limited to 'Documentation/devicetree/bindings/memory-controllers')
| -rw-r--r-- | Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml b/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml index 2353f6cf3c80..750720e0123a 100644 --- a/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml +++ b/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml @@ -106,7 +106,6 @@ allOf: - mediatek,mt2701-smi-larb - mediatek,mt2712-smi-larb - mediatek,mt6779-smi-larb - - mediatek,mt8167-smi-larb - mediatek,mt8192-smi-larb then: |