From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 2 Sep 2009 06:17:56 +0000 (+0200)
Subject: Merge commit 'v2.6.31-rc8' into x86/txt
X-Git-Tag: v2.6.32-rc1~681^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=936e894a976dd3b0f07f1f6f43c17b77b7e6146d;p=pandora-kernel.git

Merge commit 'v2.6.31-rc8' into x86/txt

Conflicts:
	arch/x86/kernel/reboot.c
	security/Kconfig

Merge reason: resolve the conflicts, bump up from rc3 to rc8.

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

936e894a976dd3b0f07f1f6f43c17b77b7e6146d
Reading git-diff-tree failed