From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 15 Jul 2008 22:29:07 +0000 (+0200)
Subject: Merge branch 'linus' into cpus4096
X-Git-Tag: v2.6.27-rc1~848^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82638844d9a8581bbf33201cc209a14876eca167;p=pandora-kernel.git

Merge branch 'linus' into cpus4096

Conflicts:

	arch/x86/xen/smp.c
	kernel/sched_rt.c
	net/iucv/iucv.c

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

82638844d9a8581bbf33201cc209a14876eca167
Reading git-diff-tree failed