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

Merge branch 'v6.1/standard/base' into v6.1/standard/preempt-rt/base 



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

# Conflicts:
#	drivers/tty/serial/8250/8250_port.c
parents f0132052 79fae610
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