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)
commitc9b77a4070a60762aee048e3c353d72fb990f940
tree7820cae684404d2bd26814a327f0e2809724dd33
parent85dbd5801f62b66e2aa7826aaefcaebead44c8a6
parentbc381eebd4b246d6cc29d97ab34d2c54ecc40a87
Merge back earlier ACPICA material.

Conflicts:
drivers/acpi/acpica/acglobal.h
include/acpi/acpixf.h