Skip to content
Commit 10db1337 authored by Bruce Ashfield's avatar Bruce Ashfield
Browse files

Merge branch 'v5.10/standard/base' into v5.10/standard/preempt-rt/nxp-sdk-5.10/nxp-soc 



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

# Conflicts:
#	drivers/dma/mxs-dma.c
parents 2f7957e8 7d078581
Hide 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