Merge remote-tracking branch 'regulator/fix/palmas' into regulator-palmas
authorMark Brown <broonie@linaro.org>
Tue, 24 Jun 2014 11:20:11 +0000 (12:20 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 24 Jun 2014 11:20:11 +0000 (12:20 +0100)
commit4c0c9cabcb30d9d3104d2482536a0f60376085f6
treec68696eb512ddf1fc32d4ad9788608a31ee4df2e
parentd6f83370ed978d5570b7c8c22988310cb9376202
parent5b01bd11b78b71ea1f5fc93e6e45ce6d71f5de1b
Merge remote-tracking branch 'regulator/fix/palmas' into regulator-palmas

Conflicts:
drivers/regulator/palmas-regulator.c
drivers/regulator/palmas-regulator.c