From c3fe97d25fb634b408444752e6b4862d7fa72333 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Wed, 21 Sep 2011 14:54:29 -0600 Subject: [PATCH] --- yaml --- r: 269367 b: refs/heads/master c: 987bfad6429aa3aefbc196bd0fc90fc48409a87b h: refs/heads/master i: 269365: 0dd789b14ed92ccc8b860f3e92943a12ba109a8b 269363: 898d9d834143e920dfb4834648815b48b9ae190d 269359: 8b4bf0eb6430ea41bd10471b716ea3398535c066 v: v3 --- [refs] | 2 +- trunk/Documentation/devicetree/bindings/vendor-prefixes.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0fe0f916a33c..6738ca2b59c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff05967a07225ab675f6e03eb2d9c155d8c8671c +refs/heads/master: 987bfad6429aa3aefbc196bd0fc90fc48409a87b diff --git a/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt b/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt index 81465c1cc6b1..e8552782b440 100644 --- a/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -7,6 +7,7 @@ adi Analog Devices, Inc. amcc Applied Micro Circuits Corporation (APM, formally AMCC) apm Applied Micro Circuits Corporation (APM) arm ARM Ltd. +atmel Atmel Corporation chrp Common Hardware Reference Platform dallas Maxim Integrated Products (formerly Dallas Semiconductor) denx Denx Software Engineering @@ -28,6 +29,7 @@ nintendo Nintendo nvidia NVIDIA nxp NXP Semiconductors powervr Imagination Technologies +qcom Qualcomm, Inc. ramtron Ramtron International samsung Samsung Semiconductor schindler Schindler