Merge remote-tracking branch 'staging/staging-next'

[karo-tx-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 2956800f0240c8b3e48c9427151220ef2fc39fc1..04eab45dd14816280f3acbd63e2f69d08b12e277 100644 (file)
--- 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.