From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 14 Aug 2008 12:58:01 +0000 (+0200)
Subject: Merge branch 'linus' into x86/core
X-Git-Tag: v2.6.28-rc1~711^2~1^2~33^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51ca3c679194e7435c25b8e77b0a73c597e41ae9;p=pandora-kernel.git

Merge branch 'linus' into x86/core

Conflicts:
	arch/x86/kernel/genapic_64.c
	include/asm-x86/kvm_host.h

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

51ca3c679194e7435c25b8e77b0a73c597e41ae9
Reading git-diff-tree failed