From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 6 Oct 2008 14:18:26 +0000 (+0200)
Subject: Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
X-Git-Tag: v2.6.28-rc1~734^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0962f402af1bb0b53ccee626785d202a10c12fff;p=pandora-kernel.git

Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1

Conflicts:
	arch/x86/kernel/process_32.c

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

0962f402af1bb0b53ccee626785d202a10c12fff
Reading git-diff-tree failed