Merge branch 'acpi-tables'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Jul 2016 11:41:01 +0000 (13:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Jul 2016 11:41:01 +0000 (13:41 +0200)
commitd5f017b796611c03d8b808d90eec0559c9049207
treec82291f92a26c4304236da18b06364bb44fe643f
parentd85f4eb6993d8c743ac89e427479cbe9efc14683
parentfafe5306f201ae3ad3f81f62d203c86952444e12
Merge branch 'acpi-tables'

* acpi-tables:
  ACPI: Rename configfs.c to acpi_configfs.c to prevent link error
  ACPI: add support for loading SSDTs via configfs
  ACPI: add support for configfs
  efi / ACPI: load SSTDs from EFI variables
  spi / ACPI: add support for ACPI reconfigure notifications
  i2c / ACPI: add support for ACPI reconfigure notifications
  ACPI: add support for ACPI reconfiguration notifiers
  ACPI / scan: fix enumeration (visited) flags for bus rescans
  ACPI / documentation: add SSDT overlays documentation
  ACPI: ARM64: support for ACPI_TABLE_UPGRADE
  ACPI / tables: introduce ARCH_HAS_ACPI_TABLE_UPGRADE
  ACPI / tables: move arch-specific symbol to asm/acpi.h
  ACPI / tables: table upgrade: refactor function definitions
  ACPI / tables: table upgrade: use cacheable map for tables

Conflicts:
arch/arm64/include/asm/acpi.h
MAINTAINERS
arch/arm64/include/asm/acpi.h
arch/x86/include/asm/acpi.h
drivers/acpi/Kconfig
include/linux/acpi.h