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 'zynq-dt-for-3.17-3' of git://git.xilinx.com/linux-xlnx into next/dt
[cascardo/linux.git]
/
Documentation
/
devicetree
/
bindings
/
vendor-prefixes.txt
diff --git
a/Documentation/devicetree/bindings/vendor-prefixes.txt
b/Documentation/devicetree/bindings/vendor-prefixes.txt
index
8ad3646
..
4257f3f
100644
(file)
--- a/
Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/
Documentation/devicetree/bindings/vendor-prefixes.txt
@@
-6,6
+6,7
@@
using them to avoid name-space collisions.
abilis Abilis Systems
active-semi Active-Semi International Inc
ad Avionic Design GmbH
+adapteva Adapteva, Inc.
adi Analog Devices, Inc.
aeroflexgaisler Aeroflex Gaisler AB
ak Asahi Kasei Corp.