From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 31 Aug 2010 07:45:21 +0000 (+0200)
Subject: Merge commit 'v2.6.36-rc3' into x86/memblock
X-Git-Tag: v2.6.37-rc1~183^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daab7fc734a53fdeaf844b7c03053118ad1769da;p=pandora-kernel.git

Merge commit 'v2.6.36-rc3' into x86/memblock

Conflicts:
	arch/x86/kernel/trampoline.c
	mm/memblock.c

Merge reason: Resolve the conflicts, update to latest upstream.

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

daab7fc734a53fdeaf844b7c03053118ad1769da
Reading git-diff-tree failed