Merge remote-tracking branch 'regulator/topic/alias' into regulator-next

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

diff --cc drivers/regulator/ti-abb-regulator.c
Simple merge

diff --cc drivers/regulator/wm831x-ldo.c
Simple merge

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

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