Merge branch 'acpica' into test