Merge branch 'linus' into x86/cpu
authorIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 14:26:31 +0000 (16:26 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 14:26:31 +0000 (16:26 +0200)
Conflicts:

arch/x86/kernel/cpu/intel_cacheinfo.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge