From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Oct 2010 20:59:32 +0000 (-0700)
Subject: Merge branch 'hwpoison-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ak... 
X-Git-Tag: v2.6.36-rc8~26
X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=6b0cd00bc396daf5c2dcf17a8d82055335341f46

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
---

6b0cd00bc396daf5c2dcf17a8d82055335341f46