diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 19:54:53 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 19:54:53 +0400 |
| commit | 139353ffbe42ac7abda42f3259c1c374cbf4b779 (patch) | |
| tree | 64208b3f2432e1e2bff5c09a860cb6065b9a6427 /drivers/misc/phantom.c | |
| parent | 251a8cfeda7c8a0ff26c62659a2358d3b4ff32df (diff) | |
| parent | 112f1fc08d0b3f81c594af617d88c0db6ce0873c (diff) | |
| download | linux-139353ffbe42ac7abda42f3259c1c374cbf4b779.tar.xz | |
Merge tag 'please-pull-einj-fix-for-acpi5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull ACPI5 error injection fix from Tony Luck:
"Trivial fix for error injection code using ACPI5 version of EINJ"
* tag 'please-pull-einj-fix-for-acpi5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
ACPI, APEI, EINJ: Add missed ACPI5 support for error trigger table
Diffstat (limited to 'drivers/misc/phantom.c')
0 files changed, 0 insertions, 0 deletions