OSDN Git Service

Merge branch 'acpi-cca'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jun 2015 23:17:35 +0000 (01:17 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jun 2015 23:17:35 +0000 (01:17 +0200)
commite193cd15ae98817ad82cc8bad61a200ac561e98c
treea4b645de8fe35f75e3d9459461bb89e8ffc41979
parent4def8a360fc6119e09916708cca0977a1495ccf4
parente144cd045e123757b6b5f732c420b94dd5544407
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
drivers/acpi/Kconfig
drivers/acpi/scan.c
include/acpi/acpi_bus.h
include/linux/acpi.h