diff options
author | Joerg Roedel <jroedel@suse.de> | 2016-07-12 13:26:59 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2016-07-12 13:26:59 +0200 |
commit | c3928e75158e846a61369207ce417a0a9ce71a0f (patch) | |
tree | 6899e00dfd654456e3114d4628bc307d067bebcf /Documentation/devicetree | |
parent | 92d21ac74a9e3c09b0b01c764e530657e4c85c49 (diff) | |
parent | bee140044579fbfdad5fd98717c0405d7b492226 (diff) | |
download | blackbird-op-linux-c3928e75158e846a61369207ce417a0a9ce71a0f.tar.gz blackbird-op-linux-c3928e75158e846a61369207ce417a0a9ce71a0f.zip |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt b/Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt index 947863acc2d4..7b94c88cf2ee 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt +++ b/Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt @@ -1,6 +1,6 @@ * ARM SMMUv3 Architecture Implementation -The SMMUv3 architecture is a significant deparature from previous +The SMMUv3 architecture is a significant departure from previous revisions, replacing the MMIO register interface with in-memory command and event queues and adding support for the ATS and PRI components of the PCIe specification. |