Merge branch 'acpica' into bleeding-edge

* acpica:
  ACPICA: Update version to 20140114.
  ACPICA: Add support for extra, optional OS-specific header file.
  ACPICA: Update the conditions to enable the utility resource dump strings.
  ACPICA: Debugger: Add new command to read/write/compare all namespace objects.
  ACPICA: Correctly support references in the union acpi_object.
  ACPICA: Update ACPICA copyrights to 2014.
  ACPICA: Improve parameter validation for acpi_install_gpe_block.
  ACPICA: Utilities: Load of local test tables is now optional.
  ACPICA: Deploy new 32/64 printf support for table override mechanism.
  ACPICA: Improve support for 32/64 bit physical addresses in printf().
Merge branch 'pm-qos' into bleeding-edge

* pm-qos:
  PM / QoS: Add type to dev_pm_qos_add_ancestor_request() arguments
  ACPI / LPSS: Support for device latency tolerance PM QoS
  ACPI / scan: Add bind/unbind callbacks to struct acpi_scan_handler
  PM / QoS: Introcuce latency tolerance device PM QoS type
  PM / QoS: Add no_constraints_value field to struct pm_qos_constraints
  PM / QoS: Rename device resume latency QoS items