From: H. Peter Anvin <hpa@zytor.com>
Date: Thu, 4 Sep 2008 16:04:45 +0000 (-0700)
Subject: Merge branch 'x86/cpu' into x86/xsave
X-Git-Tag: v2.6.28-rc1~699^2^8~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe47784ba5cbb6b713c013e046859946789b45e4;p=pandora-kernel.git

Merge branch 'x86/cpu' into x86/xsave

Conflicts:

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

fe47784ba5cbb6b713c013e046859946789b45e4
Reading git-diff-tree failed