Merge tag 'please-pull-einj-fix-for-acpi5' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Dec 2012 15:54:53 +0000 (07:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Dec 2012 15:54:53 +0000 (07:54 -0800)
commit139353ffbe42ac7abda42f3259c1c374cbf4b779
tree64208b3f2432e1e2bff5c09a860cb6065b9a6427
parent251a8cfeda7c8a0ff26c62659a2358d3b4ff32df
parent112f1fc08d0b3f81c594af617d88c0db6ce0873c
Merge tag 'please-pull-einj-fix-for-acpi5' of git://git./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