X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=Documentation%2Fdevicetree%2Fbindings%2Fvendor-prefixes.txt;h=b100a432514e28a3e942d6840dbbde17b564a55f;hb=refs%2Ftags%2FKARO-TX6-2013-11-08;hp=2956800f0240c8b3e48c9427151220ef2fc39fc1;hpb=0fbf2cc983ca15208545010863c6536d36a25f3a;p=karo-tx-linux.git

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 2956800f0240..b100a432514e 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -15,6 +15,7 @@ atmel	Atmel Corporation
 avago	Avago Technologies
 bosch	Bosch Sensortec GmbH
 brcm	Broadcom Corporation
+capella	Capella Microsystems, Inc
 cavium	Cavium, Inc.
 chrp	Common Hardware Reference Platform
 cirrus	Cirrus Logic, Inc.
@@ -22,6 +23,7 @@ cortina	Cortina Systems, Inc.
 dallas	Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom	DAVICOM Semiconductor, Inc.
 denx	Denx Software Engineering
+edt	Emerging Display Technologies
 emmicro	EM Microelectronic
 epson	Seiko Epson Corp.
 est	ESTeem Wireless Modems