diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-07 03:30:10 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-07 03:30:10 +0300 |
| commit | f2115faaf0df42623638dfbfc5bdaab6ef7375ab (patch) | |
| tree | f8bbd5a1ad3fbcb0b60e455d0dcf29a9fc25602c /tools | |
| parent | 0d51ce9ca1116e8f4dc87cb51db8dd250327e9bb (diff) | |
| parent | 29dbe1f0af88b4162d2b57e790db7a51ab061f35 (diff) | |
| download | linux-f2115faaf0df42623638dfbfc5bdaab6ef7375ab.tar.xz | |
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
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions