diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-30 00:10:27 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 17:10:49 (GMT) |
| commit | 25c1a411e8a0a709abe3449866125dc290711ea8 (patch) | |
| tree | b9392dbf99afd1d72380e464d1a221eb20fd8566 /arch/x86/boot/memory.c | |
| parent | b94d10e7f6fce9af7d5054845511a00575c4b4f5 (diff) | |
| download | linux-25c1a411e8a0a709abe3449866125dc290711ea8.tar.xz | |
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>
Diffstat (limited to 'arch/x86/boot/memory.c')
0 files changed, 0 insertions, 0 deletions