]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd2c17e 543cf4c)
Merge branch 'linus' into x86/timers
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:36:55 +0000 (12:36 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:36:55 +0000 (12:36 +0200)
1  2 
arch/x86/kernel/tsc_32.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/tsc_32.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.