diff options
| author | Olof Johansson <olof@lixom.net> | 2014-10-19 16:39:08 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-10-19 16:39:08 -0400 |
| commit | 57764512cef5d67623b6ac0a966761f5bbc43aa0 (patch) | |
| tree | d473e5c2d3e24d340179dd0a8990c61928060901 /Documentation/devicetree | |
| parent | e29c64865f6c7eeb98f7c6e2371f1100101f7562 (diff) | |
| parent | 7dac24bdc1dd561573cd8ce534a63dc975f51ca8 (diff) | |
Merge tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into fixes
Merge "qcom DT changes for v3.18-3" from Kumar Gala:
Qualcomm ARM Based Device Tree Updates for v3.18-3
* Added Board support for CM-QS600 and Sony Xperia Z1 phone
* Added SATA support on IPQ8064/AP148
* tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
ARM: dts: qcom: add CM-QS600 board
ARM: dts: qcom: Add initial DTS file for Sony Xperia Z1 phone
ARM: dts: qcom: Add SATA support on IPQ8064/AP148
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index c7bb11be15a3..723999d73744 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt | |||
| @@ -140,6 +140,7 @@ sitronix Sitronix Technology Corporation | |||
| 140 | smsc Standard Microsystems Corporation | 140 | smsc Standard Microsystems Corporation |
| 141 | snps Synopsys, Inc. | 141 | snps Synopsys, Inc. |
| 142 | solidrun SolidRun | 142 | solidrun SolidRun |
| 143 | sony Sony Corporation | ||
| 143 | spansion Spansion Inc. | 144 | spansion Spansion Inc. |
| 144 | st STMicroelectronics | 145 | st STMicroelectronics |
| 145 | ste ST-Ericsson | 146 | ste ST-Ericsson |