[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3