From a75ce6100c715a30c61f45f3bee317d09f2179fe Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 31 Jan 2012 14:44:01 +0800
Subject: [PATCH] --- yaml --- r: 292083 b: refs/heads/master c:
 c1432b1ebc684890ac81915695617ff4adfec357 h: refs/heads/master i:   292081:
 8d4484e56d50d1ab6acd630a6aba662f70ce64b0   292079:
 fda31ca5feeb0d5582375b366cfbe413c5f3153b v: v3

---
 [refs]                                      | 2 +-
 trunk/Documentation/driver-model/devres.txt | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6c42d6eae5df..803444bd63a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2950c4bbf397fc7d3d778a97c32bba0e955b47fe
+refs/heads/master: c1432b1ebc684890ac81915695617ff4adfec357
diff --git a/trunk/Documentation/driver-model/devres.txt b/trunk/Documentation/driver-model/devres.txt
index 016fd2b06a57..0cab4af0e2cf 100644
--- a/trunk/Documentation/driver-model/devres.txt
+++ b/trunk/Documentation/driver-model/devres.txt
@@ -270,3 +270,5 @@ IOMAP
 
 REGULATOR
   devm_regulator_get()
+  devm_regulator_put()
+  devm_regulator_bulk_get()