diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-24 15:20:11 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-24 15:20:11 +0400 |
| commit | 4c0c9cabcb30d9d3104d2482536a0f60376085f6 (patch) | |
| tree | c68696eb512ddf1fc32d4ad9788608a31ee4df2e /block | |
| parent | d6f83370ed978d5570b7c8c22988310cb9376202 (diff) | |
| parent | 5b01bd11b78b71ea1f5fc93e6e45ce6d71f5de1b (diff) | |
| download | linux-4c0c9cabcb30d9d3104d2482536a0f60376085f6.tar.xz | |
Merge remote-tracking branch 'regulator/fix/palmas' into regulator-palmas
Conflicts:
drivers/regulator/palmas-regulator.c
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions