Merge branch 'linus' into x86/cpu
authorIngo Molnar <mingo@elte.hu>
Fri, 15 Aug 2008 14:16:15 +0000 (16:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 15 Aug 2008 14:16:15 +0000 (16:16 +0200)
1  2 
arch/x86/kernel/cpu/intel_cacheinfo.c

Simple merge