Merge branches 'acpi-sysfs' and 'acpi-bus' into linux-next

* acpi-sysfs:
  ACPI: sysfs: Add device cid attribute for exposing _CID lists

* acpi-bus:
  ACPI: scan: Drop outdated comment regarding removed function
  ACPI: scan: Use resource_type() for resource type checking