From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 31 Dec 2008 07:31:57 +0000 (+0100)
Subject: Merge branch 'linus' into stackprotector
X-Git-Tag: v2.6.30-rc1~2^2~50^2~67^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9de18eb761f7c1c860964b2e5addc1a35c7e861;p=pandora-kernel.git

Merge branch 'linus' into stackprotector

Conflicts:
	arch/x86/include/asm/pda.h
	kernel/fork.c
---

a9de18eb761f7c1c860964b2e5addc1a35c7e861
Reading git-diff-tree failed