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

diff --cc drivers/acpi/Makefile
Simple merge

diff --cc drivers/acpi/bus.c
Simple merge

diff --cc drivers/acpi/device_pm.c
Simple merge

diff --cc drivers/acpi/internal.h
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/acpi/processor_driver.c
Simple merge

diff --cc drivers/acpi/resource.c
Simple merge

diff --cc include/linux/acpi.h
Simple merge