From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 18 Jan 2009 17:37:14 +0000 (+0100)
Subject: Merge branch 'core/percpu' into stackprotector
X-Git-Tag: v2.6.30-rc1~2^2~50^2~67^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2b062b8163391c42b3219d466ca1ac9742b9c7b;p=pandora-kernel.git

Merge branch 'core/percpu' into stackprotector

Conflicts:
	arch/x86/include/asm/pda.h
	arch/x86/include/asm/system.h

Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.

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

b2b062b8163391c42b3219d466ca1ac9742b9c7b
Reading git-diff-tree failed