Merge 'acpi-2.6.12' branch into to-akpm