From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 15 Mar 2011 07:29:44 +0000 (+0100)
Subject: Merge commit 'v2.6.38' into x86/mm
X-Git-Tag: v2.6.39-rc1~499^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2;p=pandora-kernel.git

Merge commit 'v2.6.38' into x86/mm

Conflicts:
	arch/x86/mm/numa_64.c

Merge reason: Resolve the conflict, update the branch to .38.

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

8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2
Reading git-diff-tree failed