diff options
| author | Hiago De Franco <hiago.franco@toradex.com> | 2025-03-13 11:17:01 -0300 |
|---|---|---|
| committer | Hiago De Franco <hiago.franco@toradex.com> | 2025-03-13 11:17:01 -0300 |
| commit | 6a31946af6db8b29a9146d0663cb8b61eb994eb2 (patch) | |
| tree | 207c7fe2099023070ab5c72e734adab46e274412 /lib/mpi/mpi-sub-ui.c | |
| parent | 2ccf8a89b850e7aeb1bc0629c34f22fd7c608128 (diff) | |
| parent | 963e654022cc32d72c184b4ab86a76226b3e3b8d (diff) | |
Merge tag 'v5.15.174' into 5.15-2.2.x-imx
This is the 5.15.174 stable release
Conflicts:
drivers/clk/imx/clk-lpcg-scu.c
drivers/clk/imx/clk-scu.c
drivers/edac/fsl_ddr_edac.c
drivers/pwm/pwm-imx27.c
drivers/soc/imx/soc-imx8m.c
sound/soc/fsl/fsl_micfil.c
sound/soc/fsl/fsl_micfil.h
Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
Diffstat (limited to 'lib/mpi/mpi-sub-ui.c')
0 files changed, 0 insertions, 0 deletions