From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 11 Oct 2008 18:23:20 +0000 (+0200)
Subject: Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D
X-Git-Tag: v2.6.28-rc1~711^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0afe2db21394820d32646a695eccf3fbfe6ab5c7;p=pandora-kernel.git

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
---

0afe2db21394820d32646a695eccf3fbfe6ab5c7
Reading git-diff-tree failed