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

Merge branch 'v4.19/standard/base' into v4.19/standard/preempt-rt/base 



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

# Conflicts:
#	include/linux/timer.h
#	kernel/time/hrtimer.c
#	kernel/time/timer.c
parents 21b7ded5 56b87da4
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