Merge branch 'linus' into cpumask-for-linus
authorIngo Molnar <mingo@elte.hu>
Mon, 30 Mar 2009 21:53:32 +0000 (23:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 30 Mar 2009 21:53:32 +0000 (23:53 +0200)
commit65fb0d23fcddd8697c871047b700c78817bdaa43
tree119e6e5f276622c4c862f6c9b6d795264ba1603a
parent8c083f081d0014057901c68a0a3e0f8ca7ac8d23
parentdfbbe89e197a77f2c8046a51c74e33e35f878080
Merge branch 'linus' into cpumask-for-linus

Conflicts:
arch/x86/kernel/cpu/common.c
12 files changed:
arch/x86/include/asm/processor.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
arch/x86/kernel/cpu/cpufreq/powernow-k8.c
arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
arch/x86/kernel/cpu/intel_cacheinfo.c
arch/x86/kernel/cpu/mcheck/mce_amd_64.c
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
arch/x86/kernel/process.c
arch/x86/kernel/tlb_uv.c
kernel/sched.c
mm/vmscan.c