git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
mtd
/
jedec,spi-nor.txt
diff --git
a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
index 2c91c03e7eb0265e1c7db5edc4d548600555e613..3e920ec5c4d36d48148e069ccb9de617dbee2326 100644
(file)
--- a/
Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
+++ b/
Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
@@
-14,6
+14,8
@@
Required properties:
at25df641
at26df081a
mr25h256
+ mr25h10
+ mr25h40
mx25l4005a
mx25l1606e
mx25l6405d