From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Dec 2012 15:54:53 +0000 (-0800)
Subject: Merge tag 'please-pull-einj-fix-for-acpi5' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~11938
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=139353ffbe42ac7abda42f3259c1c374cbf4b779;p=mirror_ubuntu-zesty-kernel.git

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
---

139353ffbe42ac7abda42f3259c1c374cbf4b779