From: Andi Kleen <ak@linux.intel.com>
Date: Fri, 22 Oct 2010 15:40:48 +0000 (+0200)
Subject: Merge branch 'hwpoison-hugepages' into hwpoison
X-Git-Tag: v2.6.37-rc1~109^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46e387bbd82d438b9131e237e6e2cb55a825da49;p=pandora-kernel.git

Merge branch 'hwpoison-hugepages' into hwpoison

Conflicts:
	mm/memory-failure.c
---

46e387bbd82d438b9131e237e6e2cb55a825da49
Reading git-diff-tree failed