From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 15 Sep 2009 10:18:15 +0000 (+0200)
Subject: Merge branch 'linus' into tracing/hw-breakpoints
X-Git-Tag: v2.6.33-rc1~399^2~146^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dca2d6ac09d9ef59ff46820d4f0c94b08a671202;p=pandora-kernel.git

Merge branch 'linus' into tracing/hw-breakpoints

Conflicts:
	arch/x86/kernel/process_64.c

Semantic conflict fixed in:
	arch/x86/kvm/x86.c

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

dca2d6ac09d9ef59ff46820d4f0c94b08a671202
Reading git-diff-tree failed