tree a63db9ea2871bcd05f3cb95fc152be33ea929a1a
parent c8d86d8ac439ef6c9364bf0ba3a05a3f9a8e0dea
parent 47f43e7efadacc627f325aba64c6a547de0926db
author Linus Torvalds <torvalds@linux-foundation.org> 1286485172 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1286485172 -0700

Merge branch 'hwpoison-fixes' of git://git.kernel.org/pub/scm/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