diff --git a/[refs] b/[refs]
index 2dbdf84e6015..a4570f259f15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ddca062f8d71724529b0d52609994c9886f1a18
+refs/heads/master: 1c84b60b813cb10476618b2311a89e31018b2cc4
diff --git a/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt b/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt
index e8552782b440..9f7bef601e0e 100644
--- a/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -32,6 +32,7 @@ powervr	Imagination Technologies
 qcom	Qualcomm, Inc.
 ramtron	Ramtron International
 samsung	Samsung Semiconductor
+sbs	Smart Battery System
 schindler	Schindler
 simtek
 sirf	SiRF Technology, Inc.