Merge branch 'regulator-5.2' into regulator-next

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

diff --cc drivers/regulator/tps65217-regulator.c
index 546fb5cf20239937a8aa09d3de6558a0a36f19ce,b0f5d8dcd7414c38c0ae1af296f4edd704ec3028..67ba78da77ecc95b67056f700811f246cab3a908
--- 1/drivers/regulator/tps65217-regulator.c
--- 2/drivers/regulator/tps65217-regulator.c
+++ b/drivers/regulator/tps65217-regulator.c
@@@ -58,10 -58,9 +58,9 @@@ static const unsigned int LDO1_VSEL_tab
  
  static const struct regulator_linear_range tps65217_uv1_ranges[] = {
        REGULATOR_LINEAR_RANGE(900000, 0, 24, 25000),
-       REGULATOR_LINEAR_RANGE(1550000, 25, 30, 50000),
-       REGULATOR_LINEAR_RANGE(1850000, 31, 52, 50000),
+       REGULATOR_LINEAR_RANGE(1550000, 25, 52, 50000),
        REGULATOR_LINEAR_RANGE(3000000, 53, 55, 100000),
 -      REGULATOR_LINEAR_RANGE(3300000, 56, 62, 0),
 +      REGULATOR_LINEAR_RANGE(3300000, 56, 63, 0),
  };
  
  static const struct regulator_linear_range tps65217_uv2_ranges[] = {

diff --cc sound/soc/codecs/ab8500-codec.c
Simple merge