Fix drivers/regulator/core.c merge