Merge back earlier ACPICA material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:11:38 +0000 (18:11 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:11:38 +0000 (18:11 +0200)
Conflicts:
drivers/acpi/acpica/acglobal.h


Trivial merge