Stephen Rothwell 25c1a411e8 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>

2009-03-30 10:10:49 -07:00

1.8 KiB

Raw Blame History

View Raw