]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fac3fca fc08a47)
Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 May 2017 16:06:43 +0000 (09:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 May 2017 16:06:43 +0000 (09:06 -0700)
commitde0b9d751b9cd4cfedd0112722e84d0b5abaac73
tree060ed78592245d7f3af72dfe93a36c186b0b6ffetree | snapshot
parentfac3fcae3244d6d8af61f04d2c10b4fd5ee03933commit | diff
parentfc08a4703a418a398bbb575ac311d36d110ac786commit | 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()
Linux kernel for KaRo TX COM modules