Skip to content
Commit 912e8921 authored by Bruce Ashfield's avatar Bruce Ashfield
Browse files

Merge branch 'v5.15/standard/base' into v5.15/standard/nxp-sdk-5.15/nxp-soc 



Signed-off-by: default avatarBruce Ashfield <bruce.ashfield@gmail.com>

# Conflicts:
#	sound/soc/fsl/fsl_micfil.c
parents 884adb7d 9c51a9a4
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment