Merge branch 'acpica'