From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Oct 2010 17:13:10 +0000 (-0700)
Subject: Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux... 
X-Git-Tag: v2.6.37-rc1~109
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1ebdd60cc73ed36fd977f7e719ce70d2f5cd1c0;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'hwpoison' of git://git./linux/kernel/git/ak/linux-mce-2.6

* 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6: (22 commits)
  Add _addr_lsb field to ia64 siginfo
  Fix migration.c compilation on s390
  HWPOISON: Remove retry loop for try_to_unmap
  HWPOISON: Turn addr_valid from bitfield into char
  HWPOISON: Disable DEBUG by default
  HWPOISON: Convert pr_debugs to pr_info
  HWPOISON: Improve comments in memory-failure.c
  x86: HWPOISON: Report correct address granuality for huge hwpoison faults
  Encode huge page size for VM_FAULT_HWPOISON errors
  Fix build error with !CONFIG_MIGRATION
  hugepage: move is_hugepage_on_freelist inside ifdef to avoid warning
  Clean up __page_set_anon_rmap
  HWPOISON, hugetlb: fix unpoison for hugepage
  HWPOISON, hugetlb: soft offlining for hugepage
  HWPOSION, hugetlb: recover from free hugepage error when !MF_COUNT_INCREASED
  hugetlb: move refcounting in hugepage allocation inside hugetlb_lock
  HWPOISON, hugetlb: add free check to dequeue_hwpoison_huge_page()
  hugetlb: hugepage migration core
  hugetlb: redefine hugepage copy functions
  hugetlb: add allocate function for hugepage migration
  ...
---

f1ebdd60cc73ed36fd977f7e719ce70d2f5cd1c0