Merge remote-tracking branches 'regulator/topic/notifier', 'regulator/topic/pfuze100...

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/pfuze100-regulator.c
Simple merge

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

diff --cc include/linux/regulator/machine.h
Simple merge