Skip to content
Commit 89de2147 authored by Bruce Ashfield's avatar Bruce Ashfield
Browse files

Merge branch 'v4.19/standard/base' into v4.19/standard/axxia 



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

# Conflicts:
#	arch/arm/mach-axxia/platsmp.c
parents f95c9771 7aaa3c17
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment