Merge branch 'acpi-pci'

Browse source

* 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

...

This commit is contained in:

Rafael J. Wysocki 2015-11-07 01:30:10 +01:00

parent 0d51ce9ca1 29dbe1f0af

commit f2115faaf0

12 changed files with 144 additions and 76 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

drivers/acpi/acpi_platform.c

View file

8

drivers/acpi/glue.c

View file

42

drivers/acpi/scan.c

View file

32

drivers/base/property.c

View file

19

drivers/crypto/ccp/ccp-platform.c

View file

8

drivers/net/ethernet/amd/xgbe/xgbe-main.c

View file

20

drivers/of/of_pci.c

View file

32

drivers/pci/probe.c

View file