tree b9392dbf99afd1d72380e464d1a221eb20fd8566
parent b94d10e7f6fce9af7d5054845511a00575c4b4f5
author Stephen Rothwell <sfr@canb.auug.org.au> 1238371827 +1100
committer Linus Torvalds <torvalds@linux-foundation.org> 1238433049 -0700

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>