From 9a34208102e55069edc8154324f777a20e38a311 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Mon, 19 Nov 2012 15:34:43 -0700
Subject: [PATCH] --- yaml --- r: 336558 b: refs/heads/master c:
 ae8c4209af2cec065fef15d200a42a04130799f7 h: refs/heads/master v: v3

---
 [refs]                                                      | 2 +-
 trunk/Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ab06e354159b..46be74b448e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fca5deafeac764c2ab0d37c2409fdd0962d5724
+refs/heads/master: ae8c4209af2cec065fef15d200a42a04130799f7
diff --git a/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt b/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt
index bea1e9a0388e..98271503f006 100644
--- a/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -5,6 +5,7 @@ using them to avoid name-space collisions.
 
 ad	Avionic Design GmbH
 adi	Analog Devices, Inc.
+ak	Asahi Kasei Corp.
 amcc	Applied Micro Circuits Corporation (APM, formally AMCC)
 apm	Applied Micro Circuits Corporation (APM)
 arm	ARM Ltd.