Merge branch 'fixes' into linux-next

* fixes:
  ACPICA: Update the _CPC definition to match ACPI 6.6