Merge remote-tracking branches 'regulator/fix/da9210' and 'regulator/fix/max77802...

author Mark Brown <broonie@kernel.org>

Wed, 10 Feb 2016 07:09:32 +0000 (07:09 +0000)

committer Mark Brown <broonie@kernel.org>

Wed, 10 Feb 2016 07:09:32 +0000 (07:09 +0000)
author Mark Brown <broonie@kernel.org>
Wed, 10 Feb 2016 07:09:32 +0000 (07:09 +0000)
committer Mark Brown <broonie@kernel.org>
Wed, 10 Feb 2016 07:09:32 +0000 (07:09 +0000)
diff --cc drivers/regulator/da9210-regulator.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Wed, 10 Feb 2016 07:09:32 +0000 (07:09 +0000)
committer	Mark Brown <broonie@kernel.org>
	Wed, 10 Feb 2016 07:09:32 +0000 (07:09 +0000)