Merge branch 'hwpoison-hugepages' into hwpoison
authorAndi Kleen <ak@linux.intel.com>
Fri, 22 Oct 2010 15:40:48 +0000 (17:40 +0200)
committerAndi Kleen <ak@linux.intel.com>
Fri, 22 Oct 2010 15:40:48 +0000 (17:40 +0200)
commit46e387bbd82d438b9131e237e6e2cb55a825da49
tree414948afd6b4d63c6ea8cc79ce022128bc1bf2eb
parente9d08567ef72a2d0fb9b14dded386352d3136442
parent3ef8fd7f720fc4f462fcdcae2fcde6f1c0536bfe
Merge branch 'hwpoison-hugepages' into hwpoison

Conflicts:
mm/memory-failure.c
arch/x86/mm/fault.c
include/linux/mm.h
mm/memory-failure.c
mm/memory.c