Learn more about cloning repositories
You have read-only access
x86: fix mismerge in arch/x86/include/asm/timer.h Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
