tree ff0591a719cc4ffa1c368e3e1d994b6862731f36
parent a6becfbaba801ccac4ca2708e4689a9ef013b080
parent 702b07fcc9b264c9afd372676bbdd50a762dcde0
parent 74216699ddcca13541e8494cb2b995e6a44a04d9
parent e5f660ebef68e3ed1a988ad06ba23562153cee5c
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1463409925 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1463409925 +0200

Merge branches 'acpi-numa', 'acpi-tables' and 'acpi-osi'

* acpi-numa:
  ACPI / SRAT: fix SRAT parsing order with both LAPIC and X2APIC present

* acpi-tables:
  ACPI / tables: Fix DSDT override mechanism
  ACPI / tables: Convert initrd table override to table upgrade mechanism
  ACPI / x86: Cleanup initrd related code
  ACPI / tables: Move table override mechanisms to tables.c

* acpi-osi:
  ACPI / osi: Collect _OSI handling into one single file
  ACPI / osi: Cleanup coding style issues before creating a separate OSI source file
  ACPI / osi: Cleanup OSI handling code to use bool
  ACPI / osi: Fix default _OSI(Darwin) support
  ACPI / osi: Add acpi_osi=!! to allow reverting acpi_osi=!
  ACPI / osi: Cleanup _OSI("Linux") related code before introducing new support
  ACPI / osi: Fix an issue that acpi_osi=!* cannot disable ACPICA internal strings

Conflicts:
	drivers/acpi/internal.h