| commit | 25c1a411e8a0a709abe3449866125dc290711ea8 | [log] [tgz] |
|---|---|---|
| author | Stephen Rothwell <sfr@canb.auug.org.au> | Mon Mar 30 11:10:27 2009 +1100 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 30 10:10:49 2009 -0700 |
| tree | b9392dbf99afd1d72380e464d1a221eb20fd8566 | |
| parent | b94d10e7f6fce9af7d5054845511a00575c4b4f5 [diff] |
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>