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

author Mark Brown <broonie@kernel.org>

Fri, 5 Feb 2016 18:58:30 +0000 (18:58 +0000)

committer Mark Brown <broonie@kernel.org>

Fri, 5 Feb 2016 18:58:30 +0000 (18:58 +0000)
author Mark Brown <broonie@kernel.org>
Fri, 5 Feb 2016 18:58:30 +0000 (18:58 +0000)
committer Mark Brown <broonie@kernel.org>
Fri, 5 Feb 2016 18:58:30 +0000 (18:58 +0000)
diff --cc drivers/regulator/da9210-regulator.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 5 Feb 2016 18:58:30 +0000 (18:58 +0000)
committer	Mark Brown <broonie@kernel.org>
	Fri, 5 Feb 2016 18:58:30 +0000 (18:58 +0000)