From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 18 Jul 2008 11:41:27 +0000 (+0200)
Subject: Merge branch 'linus' into x86/paravirt-spinlocks
X-Git-Tag: v2.6.27-rc1~955^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b;p=pandora-kernel.git

Merge branch 'linus' into x86/paravirt-spinlocks

Conflicts:

	arch/x86/kernel/Makefile

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

2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b
Reading git-diff-tree failed