ACPI: fix git automerge failure
Signed-off-by: Len Brown <len.brown@intel.com>
Len Brown 19 years ago 7e244322 463e7c7c