Merge tag 'iio-for-4.6a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

[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 72e2c5a2b3278facb20378383cbb63baa6485e0f..44ddc980b085a7119c33f6061c345dba3eb57d81 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -28,6 +28,7 @@ arm   ARM Ltd.
 armadeus       ARMadeus Systems SARL
 artesyn        Artesyn Embedded Technologies Inc.
 asahi-kasei    Asahi Kasei Corp.
+atlas  Atlas Scientific LLC
 atmel  Atmel Corporation
 auo    AU Optronics Corporation
 avago  Avago Technologies