From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 14 Feb 2011 10:55:18 +0000 (+0100)
Subject: Merge branch 'linus' into x86/bootmem
X-Git-Tag: v2.6.39-rc1~499^2~55^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2137d5af4259f50c19addb8246a186c9ffac325;p=pandora-kernel.git

Merge branch 'linus' into x86/bootmem

Conflicts:
	arch/x86/mm/numa_64.c

Merge reason: fix the conflict, update to latest -rc and pick up this
              dependent fix from Yinghai:

  e6d2e2b2b1e1: memblock: don't adjust size in memblock_find_base()

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

d2137d5af4259f50c19addb8246a186c9ffac325
Reading git-diff-tree failed