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

Merge branch 'v6.1/standard/base' into v6.1/standard/bcm-2xxx-rpi 



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

# Conflicts:
#	drivers/tty/serial/sc16is7xx.c
#	drivers/video/fbdev/core/fb_defio.c
parents 79803026 d33044f1
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