| commit | de0b9d751b9cd4cfedd0112722e84d0b5abaac73 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat May 27 09:06:43 2017 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat May 27 09:06:43 2017 -0700 |
| tree | 060ed78592245d7f3af72dfe93a36c186b0b6ffe | |
| parent | fac3fcae3244d6d8af61f04d2c10b4fd5ee03933 [diff] | |
| parent | fc08a4703a418a398bbb575ac311d36d110ac786 [diff] |
Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull RAS fixes from Thomas Gleixner: "Two fixlets for RAS: - Export memory_error() so the NFIT module can utilize it - Handle memory errors in NFIT correctly" * 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: acpi, nfit: Fix the memory error check in nfit_handle_mce() x86/MCE: Export memory_error()