]> git.ipfire.org Git - people/arne_f/kernel.git/commit
Merge branches 'acpi-x86', 'acpi-soc', 'acpi-pmic' and 'acpi-apple'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 3 Sep 2017 21:54:03 +0000 (23:54 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 3 Sep 2017 21:54:03 +0000 (23:54 +0200)
commit01d2f105a428bb2ebc248e71b8c86df569288b95
tree4e87e98f685b29a25dfe994b346d696fa8a31ad1
parentf928a49027ed4c5c35065102d150ada5e26bfc75
parent42d516ce3414b46fae5cb74cf180606588d2777f
parenta4bb2b4933557a8afdfe7a930cd68bd31e34a078
parent58eefe2f3f53f294cdb5a2b6121973b5ae508f01
parent8a2e487e6fc1dddd406175c1f99a733f4a1206e2
Merge branches 'acpi-x86', 'acpi-soc', 'acpi-pmic' and 'acpi-apple'

* acpi-x86:
  ACPI / boot: Add number of legacy IRQs to debug output
  ACPI / boot: Correct address space of __acpi_map_table()
  ACPI / boot: Don't define unused variables

* acpi-soc:
  ACPI / LPSS: Don't abort ACPI scan on missing mem resource

* acpi-pmic:
  ACPI / PMIC: xpower: Do pinswitch magic when reading GPADC

* acpi-apple:
  spi: Use Apple device properties in absence of ACPI resources
  ACPI / scan: Recognize Apple SPI and I2C slaves
  ACPI / property: Support Apple _DSM properties
  ACPI / property: Don't evaluate objects for devices w/o handle
  treewide: Consolidate Apple DMI checks
drivers/acpi/internal.h
drivers/acpi/property.c
drivers/acpi/scan.c
drivers/pci/quirks.c
drivers/thunderbolt/icm.c
include/linux/acpi.h