projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dlm-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
[cascardo/linux.git]
/
Documentation
/
devicetree
/
bindings
/
iommu
/
arm,smmu.txt
diff --git
a/Documentation/devicetree/bindings/iommu/arm,smmu.txt
b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
index
2d0f7cd
..
0676050
100644
(file)
--- a/
Documentation/devicetree/bindings/iommu/arm,smmu.txt
+++ b/
Documentation/devicetree/bindings/iommu/arm,smmu.txt
@@
-14,6
+14,7
@@
conditions.
"arm,smmu-v1"
"arm,smmu-v2"
"arm,mmu-400"
+ "arm,mmu-401"
"arm,mmu-500"
depending on the particular implementation and/or the