| commit | 4c0c9cabcb30d9d3104d2482536a0f60376085f6 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Tue Jun 24 12:20:11 2014 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Tue Jun 24 12:20:11 2014 +0100 |
| tree | c68696eb512ddf1fc32d4ad9788608a31ee4df2e | |
| parent | d6f83370ed978d5570b7c8c22988310cb9376202 [diff] | |
| parent | 5b01bd11b78b71ea1f5fc93e6e45ce6d71f5de1b [diff] |
Merge remote-tracking branch 'regulator/fix/palmas' into regulator-palmas Conflicts: drivers/regulator/palmas-regulator.c