diff options
| author | Javi Merino <javi.merino@arm.com> | 2016-09-30 08:14:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-30 13:45:11 -0400 |
| commit | 9a2172a8d52cf14ce44e9cadd8c9df84cf832d75 (patch) | |
| tree | bbccf78193273c745021ffa328a4117287e0616f /MAINTAINERS | |
| parent | e3b3656ca63e23b5755183718df36fb9ff518b02 (diff) | |
MAINTAINERS: Switch to kernel.org email address for Javi Merino
Change my email address to my kernel.org account instead of the ARM one.
Signed-off-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b003d0ca6238..f593300e310b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -11626,7 +11626,7 @@ F: Documentation/devicetree/bindings/thermal/ | |||
| 11626 | THERMAL/CPU_COOLING | 11626 | THERMAL/CPU_COOLING |
| 11627 | M: Amit Daniel Kachhap <amit.kachhap@gmail.com> | 11627 | M: Amit Daniel Kachhap <amit.kachhap@gmail.com> |
| 11628 | M: Viresh Kumar <viresh.kumar@linaro.org> | 11628 | M: Viresh Kumar <viresh.kumar@linaro.org> |
| 11629 | M: Javi Merino <javi.merino@arm.com> | 11629 | M: Javi Merino <javi.merino@kernel.org> |
| 11630 | L: linux-pm@vger.kernel.org | 11630 | L: linux-pm@vger.kernel.org |
| 11631 | S: Supported | 11631 | S: Supported |
| 11632 | F: Documentation/thermal/cpu-cooling-api.txt | 11632 | F: Documentation/thermal/cpu-cooling-api.txt |