Skip to content
Commit 25c1a411 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

x86: fix mismerge in arch/x86/include/asm/timer.h 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b94d10e7
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