On Tue, Dec 16, 2014 at 3:18 PM, Arnaud Ebalard <arno@xxxxxxxxxxxx> wrote:
>
> This patch fixes DT vendor-prefixes.txt documentation to reference
> isil (NASDAQ symbol and the most used prefix inside the kernel) for
> Intersil.
>
> It reverts 7c75c1d5e72b ("dt-bindings: Document deprecated device
> vendor name to fix related warning").
>
> Signed-off-by: Arnaud Ebalard <arno@xxxxxxxxxxxx>
Applied for 3.20. Thanks.
While there are not interdepencies here, it probably would have been
better to keep this series all together. Other patches have already
been picked up, so I'm just taking this one.
Rob
> ---
> Documentation/devicetree/bindings/vendor-prefixes.txt | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
> index 423d47418e72..585e5b5dca27 100644
> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> @@ -81,8 +81,7 @@ innolux Innolux Corporation
> intel Intel Corporation
> intercontrol Inter Control Group
> isee ISEE 2007 S.L.
> -isil Intersil (deprecated, use isl)
> -isl Intersil
> +isil Intersil
> karo Ka-Ro electronics GmbH
> keymile Keymile GmbH
> lacie LaCie
> --
> 2.1.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
