| commit | 477ea1169667a88d8ee12d83a0b0863091fb8670 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 19 11:18:14 2015 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 19 11:18:14 2015 -0800 |
| tree | 28aff2b1c91c491d6f939e7b29989b9aaf14ad34 | |
| parent | 6ed3e57fd2ffe63385e0073fe3cde8bf91b4c9fa [diff] | |
| parent | 0c510cc83bdbaac8406f4f7caef34f4da0ba35ea [diff] |
Merge tag 'edac_fixes_for_3.20' of git://git.kernel.org/pub/scm/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