Merge branch 'fix/88pm800' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 17 Jul 2015 11:42:48 +0000 (12:42 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 17 Jul 2015 11:42:48 +0000 (12:42 +0100)
commitbf1fc23c80e61695e8e899354d17549a4946a9d0
treed2f4a544d3b96f7e576a7622e3cd75cc2bcfa51d
parentfa26e4d2b3cf1c84f20fbc003501bb028f682d92
parent322dfa6402ec08da1ca182ac0061a1cf2c5c3101
Merge branch 'fix/88pm800' of git://git./linux/kernel/git/broonie/regulator into regulator-88pm800

Conflicts:
drivers/regulator/88pm800.c
drivers/regulator/88pm800.c