projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6ed3e57 0c510cc)
Merge tag 'edac_fixes_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Feb 2015 19:18:14 +0000 (11:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Feb 2015 19:18:14 +0000 (11:18 -0800)
commit477ea1169667a88d8ee12d83a0b0863091fb8670
tree28aff2b1c91c491d6f939e7b29989b9aaf14ad34tree | snapshot (tar.gz zip)
parent6ed3e57fd2ffe63385e0073fe3cde8bf91b4c9facommit | diff
parent0c510cc83bdbaac8406f4f7caef34f4da0ba35eacommit | diff
Merge tag 'edac_fixes_for_3.20' of git://git./linux/kernel/git/bp/bp

Pull two EDAC fixes from Borislav Petkov:

 - A fix to sb_edac for proper detection on SNB machines

 - A fix to amd64_edac to not explode on Numascale machines with more
   than 16 memory controllers, from Daniel J Blueman.

* tag 'edac_fixes_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, amd64_edac: Prevent OOPS with >16 memory controllers
  sb_edac: Fix detection on SNB machines