diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-06-18 11:31:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-06-18 11:31:25 +0200 |
| commit | b2c0931a07b7376c6291e0cfb347ad27f7b66263 (patch) | |
| tree | 58ee600a10ecc49f473429a73c6c079422dac97f /drivers/regulator/Kconfig | |
| parent | 94aafc3ee31dc199d1078ffac9edd976b7f47b3d (diff) | |
| parent | a7b359fc6a37faaf472125867c8dc5a068c90982 (diff) | |
| download | linux-b2c0931a07b7376c6291e0cfb347ad27f7b66263.tar.bz2 | |
Merge branch 'sched/urgent' into sched/core, to resolve conflicts
This commit in sched/urgent moved the cfs_rq_is_decayed() function:
a7b359fc6a37: ("sched/fair: Correctly insert cfs_rq's to list on unthrottle")
and this fresh commit in sched/core modified it in the old location:
9e077b52d86a: ("sched/pelt: Check that *_avg are null when *_sum are")
Merge the two variants.
Conflicts:
kernel/sched/fair.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/regulator/Kconfig')
| -rw-r--r-- | drivers/regulator/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 9d84d9245490..3e7a38525cb3 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -1031,7 +1031,7 @@ config REGULATOR_RT5033 current source, LDO and Buck. config REGULATOR_RTMV20 - tristate "RTMV20 Laser Diode Regulator" + tristate "Richtek RTMV20 Laser Diode Regulator" depends on I2C select REGMAP_I2C help |