projects / profile / ivi / kernel-adaptation-intel-automotive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23ac4ae aeb9c7d)
Merge remote branch 'origin/x86/cpu' into x86/amd-nb
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 1 Oct 2010 23:18:11 +0000 (16:18 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 1 Oct 2010 23:18:11 +0000 (16:18 -0700)
1  2 
arch/x86/include/asm/cpufeature.h patch | diff1 | diff2 | blob | history
arch/x86/kernel/tsc.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/asm/cpufeature.h
Simple merge
diff --cc arch/x86/kernel/tsc.c
Simple merge
Domain: System / Uncategorized;