diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-16 19:34:28 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-16 19:34:28 -0400 |
| commit | d0175e7e78ef6dddf13a67f968332b3e44a5995d (patch) | |
| tree | 885cb99021f6d16a3cbc400405654223e8359731 /net/ipv4 | |
| parent | 5957e444d2aa01705749190c32ae88fc4a029156 (diff) | |
| parent | 0cdfcc0f9352a4c076fbb51299e2b12a35619a51 (diff) | |
Merge remote-tracking branch 'regulator/topic/devm' into regulator-palmas
Conflicts:
drivers/regulator/palmas-regulator.c
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions