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

..

ccp-crypto-aes-cmac.c

crypto: ccp - Replace BUG_ON with WARN_ON and a return code

2015-10-08 21:42:15 +08:00

ccp-crypto-aes-xts.c

crypto: ccp - Updates for checkpatch warnings/errors

2015-02-27 22:48:47 +13:00

ccp-crypto-aes.c

crypto: ccp - Updates for checkpatch warnings/errors

2015-02-27 22:48:47 +13:00

ccp-crypto-main.c

crypto: ccp - Replace BUG_ON with WARN_ON and a return code

2015-10-08 21:42:15 +08:00

ccp-crypto-sha.c

crypto: ccp - Replace BUG_ON with WARN_ON and a return code

2015-10-08 21:42:15 +08:00

ccp-crypto.h

crypto: ccp - Updates for checkpatch warnings/errors

2015-02-27 22:48:47 +13:00

ccp-dev.c

crypto: ccp - Convert calls to their devm_ counterparts

2015-02-27 22:48:48 +13:00

ccp-dev.h

crypto: ccp - Updates for checkpatch warnings/errors

2015-02-27 22:48:47 +13:00

ccp-ops.c

crypto: ccp - Replace BUG_ON with WARN_ON and a return code

2015-10-08 21:42:15 +08:00

ccp-pci.c

crypto: ccp - Use module name in driver structures

2015-10-08 21:42:18 +08:00

ccp-platform.c

Merge branch 'acpi-pci'

2015-11-07 01:30:10 +01:00

Kconfig

crypto: ccp - Change references to accelerator to offload

2015-10-08 21:42:18 +08:00

Makefile

crypto: ccp - Update CCP build support

2015-02-27 22:48:48 +13:00