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

Merge branch 'linus' into stackprotector

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

b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40
Reading git-diff-tree failed