Skip to content
Commit eec19d1a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into timers/core 



Resolve semantic conflict in kernel/time/timekeeping.c.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents f726a697 a0185401
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