Merge branch 'fixes-next' into bleeding-edge

* fixes-next:
  cpuidle: remove the power_specified field in the driver
  ACPI / glue: Fix build with ACPI_GLUE_DEBUG set
  cpuidle: fix number of initialized/destroyed states
Merge branch 'acpi-scan' into bleeding-edge

* 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 'acpi-scan-next' into bleeding-edge

* acpi-scan-next:
  ACPI: update ej_event interface to take acpi_device
  ACPI / scan: Add second pass to acpi_bus_trim()
  ACPI / scan: Change the implementation of acpi_bus_trim()
  ACPI / scan: Drop the second argument of acpi_bus_trim()
  ACPI / scan: Drop the second argument of acpi_device_unregister()
  ACPI: Remove the ops field from struct acpi_device
  ACPI: remove unused acpi_op_bind and acpi_op_unbind
  ACPI / scan: Fix check of device_attach() return value.
Merge branch 'acpica-next' into bleeding-edge

* acpica-next: (49 commits)
  ACPICA: Cleanup table handler naming conflicts.
  ACPICA: Source restructuring: split large files into 8 new files.
  ACPICA: Cleanup PM_TIMER_FREQUENCY definition.
  ACPICA: Cleanup ACPI_DEBUG_PRINT macros to fix potential build breakages.
  ACPICA: Update version to 20121220.
  ACPICA: Interpreter: Fix Store() when implicit conversion is not possible.
  ACPICA: Resources: Split interrupt share/wake bits into two fields.
  ACPICA: Resources: Support for ACPI 5 wake bit in ExtendedInterrupt descriptor.
  ACPICA: Interpreter: Add warning if 64-bit constant appears in 32-bit table.
  ACPICA: Update ACPICA initialization messages.
  ACPICA: Namespace: Eliminate dot...dot output during initialization.
  ACPICA: Resource manager: Add support for ACPI 5 wake bit in IRQ descriptor.
  ACPICA: Fix possible memory leak in dispatcher error path.
  ACPICA: Update for non-configured ACPI_IS_DEBUG_ENABLED macro.
  ACPICA: iASL: Finish support for the TPM2 table.
  ACPICA: iASL: Finish support for CSRT table.
  ACPICA: Merge all debug output macros into a single file, acoutput.
  ACPICA: Deploy new ACPI_IS_DEBUG_ENABLED macro in debug output code.
  ACPICA: Update ACPI_IS_DEBUG_ENABLED macro.
  ACPICA: Eliminate superfluous return_UINT8 and return_UINT32 macros.
  ...
Merge branch 'acpi-assorted-next' into bleeding-edge

* acpi-assorted-next:
  ACPI thermal: remove unnecessary newline from exception message
  ACPI sysfs: remove unnecessary newline from exception
  ACPI video: remove unnecessary newline from error messages
  ACPI: SRAT: report non-volatile memory in debug
  ACPI: Rework acpi_get_child() to be more efficient
Merge branch 'pnp-next' into bleeding-edge

* pnp-next:
  PNPACPI: Use _CRS buffer directly as _SRS template
Merge branch 'pm-assorted-next' into bleeding-edge

* pm-assorted-next:
  PM / tracing: remove deprecated power trace API
  PM: don't use [delayed_]work_pending()
  PM / Domains: don't use [delayed_]work_pending()
Merge branch 'pm-cpufreq-next' into bleeding-edge

* pm-cpufreq-next:
  cpufreq: Simplify cpufreq_add_dev()
  cpufreq: Simplify __cpufreq_remove_dev()
  cpufreq: SPEAr: Fix sparse warning for cpufreq driver
  cpufreq: Don't use cpu removed during cpufreq_driver_unregister
  cpufreq: Notify governors when cpus are hot-[un]plugged
  cpufreq: Manage only online cpus
  cpufreq: ondemand: use all CPUs in update_sampling_rate
  cpufreq: conservative: call dbs_check_cpu only when necessary
  cpufreq: ondemand: call dbs_check_cpu only when necessary
  cpufreq: star/stop cpufreq timers on cpu hotplug
  cpufreq: handle SW coordinated CPUs
Merge branch 'acpi-pm-bleeding-edge' into bleeding-edge

* acpi-pm-bleeding-edge:
  ACPI / PM: remove leading whitespace from #ifdef
  ACPI / PM: Consolidate suspend-specific and hibernate-specific code
  ACPI / PM: Move device power management functions to device_pm.c
  ACPI / PM: Export power states of ACPI devices via sysfs
  ACPI / PM: Common string representations of device power states
  ACPI / PM: More visible function for retrieving device power states
  ACPI / PM: Change the way power transitions to D3cold are carried out
  ACPI: Use system level attribute of wakeup power resources
  ACPI: Take power resource initialization errors into account
  ACPI / scan: Consolidate extraction of power resources lists
  ACPI / scan: Remove unnecessary initialization of local variables
  ACPI / scan: Move power state initialization to a separate routine
  ACPI / PM: Take order attribute of wakeup power resources into account
  ACPI / PM: Take order attribute of power resources into account
  ACPI: Do not use device power states of power resources
  ACPI: Drop power resources driver
  ACPI / scan: Treat power resources in a special way
  ACPI / scan: More straightforward preparation of ACPI device objects
  ACPI / PM: Rework the handling of devices depending on power resources