linux/include/acpi
Rafael J. Wysocki f2115faaf0 Merge branch 'acpi-pci'
* acpi-pci:
  PCI: ACPI: Add support for PCI device DMA coherency
  PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()
  of/pci: Fix pci_get_host_bridge_device leak
  device property: ACPI: Remove unused DMA APIs
  device property: ACPI: Make use of the new DMA Attribute APIs
  device property: Adding DMA Attribute APIs for Generic Devices
  ACPI: Adding DMA Attribute APIs for ACPI Device
  device property: Introducing enum dev_dma_attr
  ACPI: Honor ACPI _CCA attribute setting

Conflicts:
	drivers/crypto/ccp/ccp-platform.c
2015-11-07 01:30:10 +01:00
..
platform
acbuffer.h
acconfig.h
acexcep.h
acnames.h
acoutput.h
acpi.h
acpi_bus.h Merge branch 'acpi-pci' 2015-11-07 01:30:10 +01:00
acpi_drivers.h
acpi_io.h
acpi_lpat.h
acpi_numa.h
acpiosxf.h
acpixf.h
acrestyp.h
actbl.h
actbl1.h
actbl2.h
actbl3.h
actypes.h
acuuid.h
apei.h
button.h
cppc_acpi.h
ghes.h
hed.h
pdc_intel.h
processor.h
reboot.h
video.h