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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
scsi
/
hisilicon-sas.txt
diff --git
a/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
b/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
index 2a42a323fa1a20d1dd85fcde820166db5f976f91..b6a869f977152f37153cc871f4ac8fc7a4d84ba9 100644
(file)
--- a/
Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
+++ b/
Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
@@
-85,5
+85,4
@@
Example:
<366 1>,<367 1>/* cq30-31 */
<376 4>,/* fatal ecc */
<381 4>;/* fatal axi */
- status = "disabled";
};