]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b94d10e) | patch
x86: fix mismerge in arch/x86/include/asm/timer.h
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Mar 2009 00:10:27 +0000 (11:10 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Mar 2009 17:10:49 +0000 (10:10 -0700)
commit25c1a411e8a0a709abe3449866125dc290711ea8
treeb9392dbf99afd1d72380e464d1a221eb20fd8566tree | snapshot
parentb94d10e7f6fce9af7d5054845511a00575c4b4f5commit | 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>
arch/x86/include/asm/timer.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.