summary refs log tree commit diff
path: root/drivers/acpi/resource.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-01 03:38:22 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-01 03:38:22 +0200
commit73990fc810bf84c5338d9596f8af8d70fe90ac72 (patch)
treeca80bce033643695e5b6f8d06d5840f4519136f4 /drivers/acpi/resource.c
parent94f2bb9b599f8d6a3a1309d39b3b219da314470c (diff)
parent1dcc3d3362b0c97e48290f7786be85b4cec2a147 (diff)
parentb6fc6072b1268a0025850cd9d3dce25a7be0158d (diff)
parent10742619ac63641bcce0a7c07f0dc7509201ed72 (diff)
downloadlinux-73990fc810bf84c5338d9596f8af8d70fe90ac72.tar.gz
Merge branches 'acpi-scan', 'acpi-processor' and 'acpi-assorted'
* acpi-scan:
  ACPI / bus: Move ACPI bus type registration
  ACPI / scan: Move bus operations and notification routines to bus.c
  ACPI / scan: Move device matching code to bus.c
  ACPI / scan: Move sysfs-related device code to a separate file

* acpi-processor:
  PCC: Disable compilation by default
  ACPI: Decouple ACPI idle and ACPI processor drivers
  ACPI: Split out ACPI PSS from ACPI Processor driver
  PCC: Initialize PCC Mailbox earlier at boot
  ACPI / processor: remove leftover __refdata annotations

* acpi-assorted:
  ACPI: fix acpi_debugfs_init prototype
  ACPI: Remove FSF mailing addresses