tree a4b645de8fe35f75e3d9459461bb89e8ffc41979
parent 4def8a360fc6119e09916708cca0977a1495ccf4
parent e144cd045e123757b6b5f732c420b94dd5544407
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1434669455 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1434669455 +0200

Merge branch 'acpi-cca'

* acpi-cca:
  ufs: fix TRUE and FALSE re-define build error
  megaraid_sas: fix TRUE and FALSE re-define build error
  amd-xgbe: Unify coherency checking logic with device_dma_is_coherent()
  crypto: ccp - Unify coherency checking logic with device_dma_is_coherent()
  device property: Introduces device_dma_is_coherent()
  arm64 : Introduce support for ACPI _CCA object
  ACPI / scan: Parse _CCA and setup device coherency