Merge remote-tracking branches 'regulator/topic/devm' and 'regulator/topic/stub' into regulator-next

2012-03-18 21:38:28 +00:00
parent c592c761a3 c1432b1ebc
commit c02f935f5f
3 changed files with 135 additions and 0 deletions
--- a/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@ -271,3 +271,8 @@ IOMAP
  pcim_iounmap()
  pcim_iomap_table()	: array of mapped addresses indexed by BAR
  pcim_iomap_regions()	: do request_region() and iomap() on multiple BARs
+
+REGULATOR
+  devm_regulator_get()
+  devm_regulator_put()
+  devm_regulator_bulk_get()