From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 9 Feb 2009 13:58:11 +0000 (+0100)
Subject: Merge commit 'v2.6.29-rc4' into core/percpu
X-Git-Tag: v2.6.30-rc1~2^2~50^2~40
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=249d51b53aea1b7cdb1be65a1a9a0c59d9e06f3e;p=pandora-kernel.git

Merge commit 'v2.6.29-rc4' into core/percpu

Conflicts:
	arch/x86/mach-voyager/voyager_smp.c
	arch/x86/mm/fault.c
---

249d51b53aea1b7cdb1be65a1a9a0c59d9e06f3e
Reading git-diff-tree failed