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

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

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

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

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

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

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

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

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