tree 6d925383f444a242ebc77d167420efb7e6ad8d99
parent d84705969f898f294bc3fc32eca33580f14105bd
parent 43603c8df97f246e8be7b9cc92a8f968a85108bd
author Ingo Molnar <mingo@elte.hu> 1223749400 +0200
committer Ingo Molnar <mingo@elte.hu> 1223749400 +0200

Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D

Conflicts:
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/signal_64.c
	include/asm-x86/cpufeature.h