tree 414948afd6b4d63c6ea8cc79ce022128bc1bf2eb
parent e9d08567ef72a2d0fb9b14dded386352d3136442
parent 3ef8fd7f720fc4f462fcdcae2fcde6f1c0536bfe
author Andi Kleen <ak@linux.intel.com> 1287762048 +0200
committer Andi Kleen <ak@linux.intel.com> 1287762048 +0200

Merge branch 'hwpoison-hugepages' into hwpoison

Conflicts:
	mm/memory-failure.c