Merge branch 'acpi-cleanup' into linux-next

Merge branch 'acpi-cleanup' into linux-next

* acpi-cleanup:
  ACPI / processor: use ACPI_COMPANION() to get ACPI device
  ACPI: correct minor typos
  ACPI / sleep: Drop redundant acpi_disabled check
  ACPI / dock: Drop redundant acpi_disabled check
  ACPI / table: Replace '1' with specific error return values
  ACPI: remove trailing whitespace
  ACPI / IBFT: Fix incorrect <acpi/acpi.h> inclusion in iSCSI boot firmware module
  ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>
  SFI / ACPI: Fix warnings reported during builds with W=1
  ACPI: Clean up incorrect inclusion of an ACPICA header
  ACPI: Clean up inclusions of ACPI header files

Conflicts:
	drivers/acpi/nvs.c
	drivers/hwmon/asus_atk0110.c