From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 18 Jun 2015 23:17:35 +0000 (+0200)
Subject: Merge branch 'acpi-cca'
X-Git-Tag: firefly_0821_release~176^2~1607^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e193cd15ae98817ad82cc8bad61a200ac561e98c;p=firefly-linux-kernel-4.4.55.git

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
---

e193cd15ae98817ad82cc8bad61a200ac561e98c