diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-19 11:18:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-19 11:18:14 -0800 |
| commit | 477ea1169667a88d8ee12d83a0b0863091fb8670 (patch) | |
| tree | 28aff2b1c91c491d6f939e7b29989b9aaf14ad34 /drivers/acpi/Makefile | |
| parent | Merge tag 'platform-drivers-x86-v3.20-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86 (diff) | |
| parent | EDAC, amd64_edac: Prevent OOPS with >16 memory controllers (diff) | |
| download | linux-dev-477ea1169667a88d8ee12d83a0b0863091fb8670.tar.xz linux-dev-477ea1169667a88d8ee12d83a0b0863091fb8670.zip | |
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
Diffstat (limited to 'drivers/acpi/Makefile')
0 files changed, 0 insertions, 0 deletions