projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'clk-for-linus-3.10' of git://git.linaro.org/people/mturquette/linux
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
Documentation
/
devicetree
/
bindings
/
vendor-prefixes.txt
diff --git
a/Documentation/devicetree/bindings/vendor-prefixes.txt
b/Documentation/devicetree/bindings/vendor-prefixes.txt
index
ca60849
..
4d1919b
100644
(file)
--- a/
Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/
Documentation/devicetree/bindings/vendor-prefixes.txt
@@
-5,6
+5,7
@@
using them to avoid name-space collisions.
ad Avionic Design GmbH
adi Analog Devices, Inc.
+aeroflexgaisler Aeroflex Gaisler AB
ak Asahi Kasei Corp.
amcc Applied Micro Circuits Corporation (APM, formally AMCC)
apm Applied Micro Circuits Corporation (APM)