Merge back earlier ACPICA material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 6 May 2014 22:45:27 +0000 (00:45 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 6 May 2014 22:45:27 +0000 (00:45 +0200)

Trivial merge