Merge branch 'acpica-fixes'