Merge branch 'hwpoison-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Oct 2010 20:59:32 +0000 (13:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Oct 2010 20:59:32 +0000 (13:59 -0700)
commit6b0cd00bc396daf5c2dcf17a8d82055335341f46
treea63db9ea2871bcd05f3cb95fc152be33ea929a1a
parentc8d86d8ac439ef6c9364bf0ba3a05a3f9a8e0dea
parent47f43e7efadacc627f325aba64c6a547de0926db
Merge branch 'hwpoison-fixes' of git://git./linux/kernel/git/ak/linux-mce-2.6

* 'hwpoison-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6:
  HWPOISON: Stop shrinking at right page count
  HWPOISON: Report correct address granuality for AO huge page errors
  HWPOISON: Copy si_addr_lsb to user
  page-types.c: fix name of unpoison interface