Merge back APEI material for v4.16.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 21 Dec 2017 00:54:44 +0000 (01:54 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 21 Dec 2017 00:54:44 +0000 (01:54 +0100)

Trivial merge