Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/drivers'...

diff --cc arch/arm/mach-exynos/mach-nuri.c
Simple merge

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

diff --cc drivers/regulator/core.c
index e70dd382a009a2db05d78087b6e0e588584e6b6e,2f0d557a910d4bdf92d687c074c23345633727ee,7943fd64988d52cc9516816ee953da9ef33c27a1,9fafa00b8cd427650286cc9aa6bfb36da4d4fc19..db79987b602c63097bfa1fc967280fa2c911a351
--- 1/drivers/regulator/core.c
--- 2/drivers/regulator/core.c
--- 3/drivers/regulator/core.c
--- 4/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@@@ -2872,9 -2886,9 -2874,9 -2974,10 +2988,10 @@@@@ regulator_register(const struct regulat
        mutex_lock(&regulator_list_mutex);
    
        mutex_init(&rdev->mutex);
--      rdev->reg_data = driver_data;
++      rdev->reg_data = config->driver_data;
        rdev->owner = regulator_desc->owner;
        rdev->desc = regulator_desc;
+++     rdev->regmap = config->regmap;
        INIT_LIST_HEAD(&rdev->consumer_list);
        INIT_LIST_HEAD(&rdev->list);
        BLOCKING_INIT_NOTIFIER_HEAD(&rdev->notifier);

diff --cc sound/soc/codecs/sgtl5000.c
Simple merge