From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 23 Sep 2008 21:26:42 +0000 (+0200)
Subject: Merge branch 'timers/urgent' into x86/xen
X-Git-Tag: v2.6.28-rc1~699^2^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07bbc16a8676b06950a21f35b59f69b2fe763bbd;p=pandora-kernel.git

Merge branch 'timers/urgent' into x86/xen

Conflicts:
	arch/x86/kernel/process_32.c
	arch/x86/kernel/process_64.c

Manual merge:

	arch/x86/kernel/smpboot.c

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

07bbc16a8676b06950a21f35b59f69b2fe763bbd
Reading git-diff-tree failed