git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74e411c 0665190)
Merge branch 'linus' into x86/timers
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:20:57 +0000 (11:20 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:20:57 +0000 (11:20 +0200)
1  2 
arch/x86/kernel/tsc_32.c patch | diff1 | diff2 | blob | history
arch/x86/kernel/tsc_64.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/tsc_32.c
Simple merge
diff --cc arch/x86/kernel/tsc_64.c
Simple merge
Pandora Kernel Repository