Merge branch 'acpi-scan' into linux-next

* acpi-scan:
  ACPI / scan: Treat power resources in a special way
  ACPI: Remove unused struct acpi_pci_root.id member
  ACPI: Drop ACPI device .bind() and .unbind() callbacks
  ACPI / PCI: Move the _PRT setup and cleanup code to pci-acpi.c
  ACPI / PCI: Rework the setup and cleanup of device wakeup
  ACPI: Add .setup() and .cleanup() callbacks to struct acpi_bus_type
  ACPI: Make acpi_bus_scan() and acpi_bus_add() take only one argument
  ACPI: Replace ACPI device add_type field with a match_driver flag
  ACPI: Drop the second argument of acpi_bus_scan()
  ACPI: Remove the arguments of acpi_bus_add() that are not used
  ACPI: Remove acpi_start_single_object() and acpi_bus_start()
  ACPI / PCI: Fold acpi_pci_root_start() into acpi_pci_root_add()
  ACPI: Change the ordering of acpi_bus_check_add()
  ACPI: Replace struct acpi_bus_ops with enum type
  ACPI: Reduce the usage of struct acpi_bus_ops
  ACPI: Make acpi_bus_add() and acpi_bus_start() visibly different
  ACPI: Change the ordering of PCI root bridge driver registrarion
  ACPI: Separate adding ACPI device objects from probing ACPI drivers
Merge branch 'master' into linux-next

* master:
  PM: Move disabling/enabling runtime PM to late suspend/early resume
  PM / QoS: Rename local variable in dev_pm_qos_add_ancestor_request()
Merge branch 'acpica-next' into linux-next

* acpica-next:
  ACPICA: Update version to 20121114.
  ACPICA: AcpiGetObjectInfo: optimize exit for mutex failure.
  ACPICA: Resource Manager: update template walking with ACPI_NEXT_RESOURCE.
  ACPICA: Enhance the ACPI_GETx and ACPI_SETx macros.
  ACPICA: Add macros to extract flag bits from resource descriptors.
  ACPICA: Disassembler: Add new ACPI 5 interrupt sharing flags.
  ACPICA: Debugger: Major update for the Disassemble<method> command.
  ACPICA: Performance: Remove function tracing from critical allocation functions.
  ACPICA: Performance enhancement for ACPI package objects.
  ACPICA: Fix possible memory leak.
  ACPICA: Update initialization codes.
  ACPICA: Enhance error messages.
  ACPICA: Fix broken call depth tracing logic.
  ACPICA: Cleanup coding style to reduce differences between Linux and ACPICA.
  ACPICA: Cleanup indentation to reduce differences between Linux and ACPICA.
  ACPICA: Cleanup source to reduce differences between Linux and ACPICA.
  ACPICA: Update codes under disabled build options.
  ACPICA: Update compilation environment settings.
  ACPICA: Cleanup updated comments.