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)
Conflicts:
mm/memory-failure.c


Trivial merge