diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-17 00:34:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-17 00:34:28 +0100 |
| commit | d0175e7e78ef6dddf13a67f968332b3e44a5995d (patch) | |
| tree | 885cb99021f6d16a3cbc400405654223e8359731 /Documentation | |
| parent | 5957e444d2aa01705749190c32ae88fc4a029156 (diff) | |
| parent | 0cdfcc0f9352a4c076fbb51299e2b12a35619a51 (diff) | |
| download | linux-d0175e7e78ef6dddf13a67f968332b3e44a5995d.tar.gz linux-d0175e7e78ef6dddf13a67f968332b3e44a5995d.tar.bz2 linux-d0175e7e78ef6dddf13a67f968332b3e44a5995d.zip | |
Merge remote-tracking branch 'regulator/topic/devm' into regulator-palmas
Conflicts:
drivers/regulator/palmas-regulator.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/driver-model/devres.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt index fcb34a5697ea..3d9c2a766230 100644 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt @@ -283,6 +283,7 @@ REGULATOR devm_regulator_get() devm_regulator_put() devm_regulator_bulk_get() + devm_regulator_register() CLOCK devm_clk_get() |