tree d2f4a544d3b96f7e576a7622e3cd75cc2bcfa51d
parent fa26e4d2b3cf1c84f20fbc003501bb028f682d92
parent 322dfa6402ec08da1ca182ac0061a1cf2c5c3101
author Mark Brown <broonie@kernel.org> 1437133368 +0100
committer Mark Brown <broonie@kernel.org> 1437133368 +0100

Merge branch 'fix/88pm800' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-88pm800

Conflicts:
	drivers/regulator/88pm800.c