diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 15:13:59 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 15:13:59 -0400 |
| commit | 83fe628e16d84efc8df2731bc403eae4e4f53801 (patch) | |
| tree | 9a51c292235621d0f4f632c2a55ddb5a6ab582af /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | 853a0231e057c04255a848f6998f84faaa635c58 (diff) | |
| parent | 426f1af947c61dee48a9267f84bff227e503a547 (diff) | |
Merge branch 'renesas/soc' into next/soc2
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.txt')
| -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 ecc6a6cd26c1..a20008ab319a 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt | |||
| @@ -30,6 +30,7 @@ national National Semiconductor | |||
| 30 | nintendo Nintendo | 30 | nintendo Nintendo |
| 31 | nvidia NVIDIA | 31 | nvidia NVIDIA |
| 32 | nxp NXP Semiconductors | 32 | nxp NXP Semiconductors |
| 33 | picochip Picochip Ltd | ||
| 33 | powervr Imagination Technologies | 34 | powervr Imagination Technologies |
| 34 | qcom Qualcomm, Inc. | 35 | qcom Qualcomm, Inc. |
| 35 | ramtron Ramtron International | 36 | ramtron Ramtron International |