Merge remote-tracking branch 'regulator/fix/s2mpa01' into regulator-linus
authorMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:07:59 +0000 (17:07 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:07:59 +0000 (17:07 +0100)
commit277b1be9d4c5b6f8e33d4445142ca39bafb05c2e
tree0ece792c5f8ede1e0b69a02dad5eb0731f45985d
parentfad01e866afdbe01a1f3ec06a39c3a8b9e197014
parent112da5cb43427b843e49b8710f53ecdbb3471d9f
Merge remote-tracking branch 'regulator/fix/s2mpa01' into regulator-linus