From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 29 Jul 2008 09:54:24 +0000 (+0200)
Subject: Merge commit 'v2.6.27-rc1' into x86/microcode
X-Git-Tag: v2.6.28-rc1~699^2^4~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3825c9e8d01e4310c40a3903a354c433c32a7b6f;p=pandora-kernel.git

Merge commit 'v2.6.27-rc1' into x86/microcode

Conflicts:

	arch/x86/kernel/microcode.c

Manual resolutions:

	arch/x86/kernel/microcode_amd.c
	arch/x86/kernel/microcode_intel.c

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

3825c9e8d01e4310c40a3903a354c433c32a7b6f
Reading git-diff-tree failed