Skip to content
Commit 0083812e authored by Bruce Ashfield's avatar Bruce Ashfield
Browse files

Merge branch 'v5.15/standard/base' into v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga 



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

# Conflicts:
#	drivers/firmware/stratix10-svc.c
parents 6f5029c8 024d08fb
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