Merge remote-tracking branches 'regulator/topic/mt6311', 'regulator/topic/ocp', ...

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
Simple merge

diff --cc drivers/regulator/core.c
Simple merge

diff --cc drivers/regulator/da9210-regulator.c
Simple merge

diff --cc drivers/regulator/da9211-regulator.c
Simple merge

diff --cc drivers/regulator/isl9305.c
Simple merge

diff --cc drivers/regulator/lp872x.c
Simple merge

diff --cc drivers/regulator/ltc3589.c
Simple merge

diff --cc drivers/regulator/max8973-regulator.c
Simple merge

diff --cc drivers/regulator/pfuze100-regulator.c
Simple merge