Skip to content

Commit af08929

Browse files
committed
Merge branch 'pm-misc' into linux-next
* pm-misc: MAINTAINERS: Update contact with the kernel.org address
2 parents b2028e5 + 3ea2067 commit af08929

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,10 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
210210
Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
211211
Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
212212
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
213+
Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@linaro.org>
214+
Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@free.fr>
215+
Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@linexp.org>
216+
Daniel Lezcano <daniel.lezcano@kernel.org> <dlezcano@fr.ibm.com>
213217
Daniel Thompson <danielt@kernel.org> <daniel.thompson@linaro.org>
214218
Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
215219
David Brownell <david-b@pacbell.net>

MAINTAINERS

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6280,7 +6280,7 @@ S: Maintained
62806280
F: include/linux/clk.h
62816281

62826282
CLOCKSOURCE, CLOCKEVENT DRIVERS
6283-
M: Daniel Lezcano <daniel.lezcano@linaro.org>
6283+
M: Daniel Lezcano <daniel.lezcano@kernel.org>
62846284
M: Thomas Gleixner <tglx@kernel.org>
62856285
L: linux-kernel@vger.kernel.org
62866286
S: Supported
@@ -6669,7 +6669,7 @@ F: rust/kernel/cpu.rs
66696669

66706670
CPU IDLE TIME MANAGEMENT FRAMEWORK
66716671
M: "Rafael J. Wysocki" <rafael@kernel.org>
6672-
M: Daniel Lezcano <daniel.lezcano@linaro.org>
6672+
M: Daniel Lezcano <daniel.lezcano@kernel.org>
66736673
R: Christian Loehle <christian.loehle@arm.com>
66746674
L: linux-pm@vger.kernel.org
66756675
S: Maintained
@@ -6699,15 +6699,15 @@ F: arch/x86/kernel/msr.c
66996699

67006700
CPUIDLE DRIVER - ARM BIG LITTLE
67016701
M: Lorenzo Pieralisi <lpieralisi@kernel.org>
6702-
M: Daniel Lezcano <daniel.lezcano@linaro.org>
6702+
M: Daniel Lezcano <daniel.lezcano@kernel.org>
67036703
L: linux-pm@vger.kernel.org
67046704
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
67056705
S: Maintained
67066706
T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
67076707
F: drivers/cpuidle/cpuidle-big_little.c
67086708

67096709
CPUIDLE DRIVER - ARM EXYNOS
6710-
M: Daniel Lezcano <daniel.lezcano@linaro.org>
6710+
M: Daniel Lezcano <daniel.lezcano@kernel.org>
67116711
M: Kukjin Kim <kgene@kernel.org>
67126712
R: Krzysztof Kozlowski <krzk@kernel.org>
67136713
L: linux-pm@vger.kernel.org
@@ -26217,7 +26217,7 @@ F: drivers/media/radio/radio-raremono.c
2621726217

2621826218
THERMAL
2621926219
M: Rafael J. Wysocki <rafael@kernel.org>
26220-
M: Daniel Lezcano <daniel.lezcano@linaro.org>
26220+
M: Daniel Lezcano <daniel.lezcano@kernel.org>
2622126221
R: Zhang Rui <rui.zhang@intel.com>
2622226222
R: Lukasz Luba <lukasz.luba@arm.com>
2622326223
L: linux-pm@vger.kernel.org
@@ -26247,7 +26247,7 @@ F: drivers/thermal/amlogic_thermal.c
2624726247

2624826248
THERMAL/CPU_COOLING
2624926249
M: Amit Daniel Kachhap <amit.kachhap@gmail.com>
26250-
M: Daniel Lezcano <daniel.lezcano@linaro.org>
26250+
M: Daniel Lezcano <daniel.lezcano@kernel.org>
2625126251
M: Viresh Kumar <viresh.kumar@linaro.org>
2625226252
R: Lukasz Luba <lukasz.luba@arm.com>
2625326253
L: linux-pm@vger.kernel.org

0 commit comments

Comments
 (0)