commit | 6b0cd00bc396daf5c2dcf17a8d82055335341f46 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 07 13:59:32 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 07 13:59:32 2010 -0700 |
tree | a63db9ea2871bcd05f3cb95fc152be33ea929a1a | |
parent | c8d86d8ac439ef6c9364bf0ba3a05a3f9a8e0dea [diff] | |
parent | 47f43e7efadacc627f325aba64c6a547de0926db [diff] |
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