From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 4 Sep 2008 11:02:35 +0000 (+0200)
Subject: Merge branch 'linus' into x86/x2apic
X-Git-Tag: v2.6.28-rc1~711^2^2~44^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42390cdec5f6e6e2ee54f308474a6ef7dd16aa5c;p=pandora-kernel.git

Merge branch 'linus' into x86/x2apic

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

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

42390cdec5f6e6e2ee54f308474a6ef7dd16aa5c
Reading git-diff-tree failed