From: H. Peter Anvin <hpa@zytor.com>
Date: Thu, 4 Sep 2008 15:08:42 +0000 (-0700)
Subject: Merge branch 'x86/cpu' into x86/core
X-Git-Tag: v2.6.28-rc1~711^2^2~44^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7203781c98ad9147564d327de6f6513ad8fc0f4e;p=pandora-kernel.git

Merge branch 'x86/cpu' into x86/core

Conflicts:

	arch/x86/kernel/cpu/feature_names.c
	include/asm-x86/cpufeature.h
---

7203781c98ad9147564d327de6f6513ad8fc0f4e
Reading git-diff-tree failed