Merge branch 'linus' into timers/core
Resolve semantic conflict in kernel/time/timekeeping.c.
Signed-off-by: NIngo Molnar <mingo@kernel.org>
Showing
想要评论请 注册 或 登录
Resolve semantic conflict in kernel/time/timekeeping.c.
Signed-off-by: NIngo Molnar <mingo@kernel.org>