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)
commitb7d0b6784565b846f3562608dfb3cf8516718724
tree50a4931ce7e62e78b664bb8f43da2f4508c319f9
parentcdcf772ed163651cacac8098b4974aba7f9e1c73
parentc9272c4f9fbe2087beb3392f526dc5b19efaa56b
Merge branch 'linus' into x86/cpu

Conflicts:

arch/x86/kernel/cpu/intel_cacheinfo.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/intel_cacheinfo.c